Merge branch 'colshape-type' of https://github.com/CrosRoad95/mtasa-blue into 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)
@@ -34,10 +35,60 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
 
     lua_classfunction(luaVM, "getElementsWithin", "getElementsWithinColShape");
     lua_classvariable(luaVM, "elementsWithin", NULL, "getElementsWithinColShape");
+  
+    lua_classvariable(luaVM, "elementsWithin", NULL, "getElementsWithinColShape");
+    lua_classvariable(luaVM, "shapeType", NULL, "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)
+        {
+            switch ( pColShape->GetShapeType( ) )
+            {
+            case 0:
+                lua_pushstring(luaVM, "Circle");
+                break;
+            case 1:
+                lua_pushstring(luaVM, "Cuboid");
+                break;
+            case 2:
+                lua_pushstring(luaVM, "Sphere");
+                break;
+            case 3:
+                lua_pushstring(luaVM, "Rectangle");
+                break;
+            case 4:
+                lua_pushstring(luaVM, "Polygon");
+                break;
+            case 5:
+                lua_pushstring(luaVM, "Tube");
+                break;
+            default:
+                lua_pushboolean(luaVM, false);
+            }
+            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);
 };

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

@@ -38,6 +38,7 @@ class CLuaElementDefs : public CLuaDefs
     LUA_DECLARE(IsElementWithinColShape);
     LUA_DECLARE(IsElementWithinMarker);
     LUA_DECLARE(GetElementsWithinColShape);
+    LUA_DECLARE(GetColShapeType);
     LUA_DECLARE(GetElementDimension);
     LUA_DECLARE(GetElementZoneName);
     LUA_DECLARE(GetElementBoundingBox);

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

@@ -14,12 +14,14 @@
 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)
@@ -32,11 +34,38 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "Sphere", "createColSphere");
     lua_classfunction(luaVM, "Tube", "createColTube");
     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 ( ) + 1);   // start from 1 not 0
+            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,5 @@ class CLuaColShapeDefs : public CLuaDefs
     LUA_DECLARE(CreateColRectangle);
     LUA_DECLARE(CreateColPolygon);
     LUA_DECLARE(CreateColTube);
+    LUA_DECLARE(GetColShapeType);
 };