shape type function

Author: CrosRoad95

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

@@ -33,7 +33,10 @@ void CLuaColShapeDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "Polygon", "createColPolygon" );
 
     lua_classfunction ( luaVM, "getElementsWithin", "getElementsWithinColShape" );
+    lua_classfunction ( luaVM, "getShapeType", "getColShapeType" );
+
     lua_classvariable ( luaVM, "elementsWithin", NULL, "getElementsWithinColShape" );
+    lua_classvariable ( luaVM, "shape", NULL, "getColShapeType" );
 
     lua_registerclass ( luaVM, "ColShape", "Element" );
 }

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

@@ -36,6 +36,7 @@ void CLuaElementDefs::LoadFunctions ( void )
     CLuaCFunctions::AddFunction ( "isElementWithinColShape", IsElementWithinColShape );
     CLuaCFunctions::AddFunction ( "isElementWithinMarker", IsElementWithinMarker );
     CLuaCFunctions::AddFunction ( "getElementsWithinColShape", GetElementsWithinColShape );
+    CLuaCFunctions::AddFunction ( "getColShapeType", GetColShapeType );
     CLuaCFunctions::AddFunction ( "getElementDimension", GetElementDimension );
     CLuaCFunctions::AddFunction ( "getElementBoundingBox", GetElementBoundingBox );
     CLuaCFunctions::AddFunction ( "getElementRadius", GetElementRadius );
@@ -891,6 +892,30 @@ int CLuaElementDefs::IsElementWithinMarker ( lua_State* luaVM )
     return 1;
 }
 
+int CLuaElementDefs::GetColShapeType ( lua_State* luaVM )
+{
+    // Verify the arguments
+    CClientColShape* pColShape = NULL;
+    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 );
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage ( ) );
+
+    // Failed
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
 
 int CLuaElementDefs::GetElementsWithinColShape ( lua_State* luaVM )
 {

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

@@ -34,6 +34,10 @@ void CLuaColShapeDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "Polygon", "createColPolygon" );
 
     lua_classfunction ( luaVM, "getElementsWithin", "getElementsWithinColShape" );
+    lua_classfunction ( luaVM, "getShapeType", "getColShapeType" );
+
+    lua_classvariable ( luaVM, "shape", NULL, "getColShapeType" );
+
     lua_registerclass ( luaVM, "ColShape", "Element" );
 }
 

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

@@ -47,6 +47,7 @@ void CLuaElementDefs::LoadFunctions ( void )
     CLuaCFunctions::AddFunction ( "getElementType", getElementType );
     CLuaCFunctions::AddFunction ( "getElementInterior", getElementInterior );
     CLuaCFunctions::AddFunction ( "getElementsWithinColShape", getElementsWithinColShape );
+    CLuaCFunctions::AddFunction ( "getColShapeType", getColShapeType );
     CLuaCFunctions::AddFunction ( "getElementDimension", getElementDimension );
     CLuaCFunctions::AddFunction ( "getElementZoneName", getElementZoneName );
     CLuaCFunctions::AddFunction ( "getElementColShape", getElementColShape );
@@ -964,6 +965,30 @@ int CLuaElementDefs::isElementWithinColShape ( lua_State* luaVM )
     return 1;
 }
 
+int CLuaElementDefs::getColShapeType ( lua_State* luaVM )
+{
+    // Verify the arguments
+    CColShape* pColShape = NULL;
+    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 CLuaElementDefs::getElementsWithinColShape ( lua_State* luaVM )
 {

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

@@ -47,6 +47,7 @@ class CLuaElementDefs: public CLuaDefs
     LUA_DECLARE ( getElementsByType  );
     LUA_DECLARE ( getElementInterior );
     LUA_DECLARE ( getElementsWithinColShape );
+    LUA_DECLARE ( getColShapeType );
     LUA_DECLARE ( getElementDimension );
     LUA_DECLARE ( getElementZoneName );
     LUA_DECLARE ( getElementColShape );