Merge branch 'CrosRoad95-colshape-type'

Author: qaisjp

Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp

@@ -19,6 +19,7 @@ void CLuaColShapeDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("createColRectangle", CreateColRectangle);
     CLuaCFunctions::AddFunction("createColPolygon", CreateColPolygon);
     CLuaCFunctions::AddFunction("createColTube", CreateColTube);
+    CLuaCFunctions::AddFunction("getColShapeType", GetColShapeType);
 }
 
 void CLuaColShapeDefs::AddClass(lua_State* luaVM)
@@ -33,11 +34,38 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "Polygon", "createColPolygon");
 
     lua_classfunction(luaVM, "getElementsWithin", "getElementsWithinColShape");
-    lua_classvariable(luaVM, "elementsWithin", NULL, "getElementsWithinColShape");
+    lua_classfunction(luaVM, "getShapeType", "getColShapeType");
+
+    lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
 
     lua_registerclass(luaVM, "ColShape", "Element");
 }
 
+int CLuaColShapeDefs::GetColShapeType(lua_State* luaVM)
+{
+    // Verify the arguments
+    CClientColShape* pColShape = nullptr;
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+
+    if (!argStream.HasErrors())
+    {
+        // Grab our VM
+        CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+        if (pLuaMain)
+        {
+            lua_pushnumber(luaVM, pColShape->GetShapeType());
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    // Failed
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaColShapeDefs::CreateColCircle(lua_State* luaVM)
 {
     CVector2D        vecPosition;

Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h

@@ -24,4 +24,6 @@ class CLuaColShapeDefs : public CLuaDefs
     LUA_DECLARE(CreateColRectangle);
     LUA_DECLARE(CreateColPolygon);
     LUA_DECLARE(CreateColTube);
+
+    LUA_DECLARE(GetColShapeType);
 };

Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp

@@ -13,13 +13,13 @@
 
 void CLuaColShapeDefs::LoadFunctions()
 {
-    // Shape create funcs
     CLuaCFunctions::AddFunction("createColCircle", CreateColCircle);
     CLuaCFunctions::AddFunction("createColCuboid", CreateColCuboid);
     CLuaCFunctions::AddFunction("createColSphere", CreateColSphere);
     CLuaCFunctions::AddFunction("createColRectangle", CreateColRectangle);
     CLuaCFunctions::AddFunction("createColPolygon", CreateColPolygon);
     CLuaCFunctions::AddFunction("createColTube", CreateColTube);
+    CLuaCFunctions::AddFunction("getColShapeType", GetColShapeType);
 }
 
 void CLuaColShapeDefs::AddClass(lua_State* luaVM)
@@ -34,9 +34,38 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "Polygon", "createColPolygon");
 
     lua_classfunction(luaVM, "getElementsWithin", "getElementsWithinColShape");
+    lua_classfunction(luaVM, "getShapeType", "getColShapeType");
+
+    lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
+
     lua_registerclass(luaVM, "ColShape", "Element");
 }
 
+int CLuaColShapeDefs::GetColShapeType(lua_State* luaVM)
+{
+    // Verify the arguments
+    CColShape*       pColShape = nullptr;
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+
+    if (!argStream.HasErrors())
+    {
+        // Grab our VM
+        CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+        if (pLuaMain)
+        {
+            lua_pushnumber(luaVM, pColShape->GetShapeType());
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    // Failed
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaColShapeDefs::CreateColCircle(lua_State* luaVM)
 {
     CVector2D vecPosition;

Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h

@@ -25,4 +25,6 @@ class CLuaColShapeDefs : public CLuaDefs
     LUA_DECLARE(CreateColRectangle);
     LUA_DECLARE(CreateColPolygon);
     LUA_DECLARE(CreateColTube);
-};
+
+    LUA_DECLARE(GetColShapeType);
+};