Fix ColShape:getSize vector return for non-OOP functions

Author: qaisjp

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

@@ -57,7 +57,7 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
 
     lua_classfunction(luaVM, "getRadius", GetColShapeRadius);
     lua_classfunction(luaVM, "setRadius", SetColShapeRadius);
-    lua_classfunction(luaVM, "getSize", GetColShapeSize);
+    lua_classfunction(luaVM, "getSize", OOP_GetColShapeSize);
     lua_classfunction(luaVM, "setSize", SetColShapeSize);
     lua_classfunction(luaVM, "getPoints", GetColPolygonPoints);
     lua_classfunction(luaVM, "getPointPosition", GetColPolygonPointPosition);
@@ -69,7 +69,7 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
 
     lua_classvariable(luaVM, "radius", SetColShapeRadius, GetColShapeRadius);
-    lua_classvariable(luaVM, "size", SetColShapeSize, GetColShapeSize);
+    lua_classvariable(luaVM, "size", SetColShapeSize, OOP_GetColShapeSize);
     lua_classvariable(luaVM, "points", nullptr, GetColPolygonPoints);
 
     lua_registerclass(luaVM, "ColShape", "Element");
@@ -455,6 +455,45 @@ int CLuaColShapeDefs::GetColShapeSize(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pColShape);
 
+    if (argStream.HasErrors())
+        return luaL_error(luaVM, argStream.GetFullErrorMessage());
+
+    switch (pColShape->GetShapeType())
+    {
+        case COLSHAPE_RECTANGLE:
+        {
+            CVector2D size = static_cast<CClientColRectangle*>(pColShape)->GetSize();
+            lua_pushnumber(luaVM, size.fX);
+            lua_pushnumber(luaVM, size.fY);
+            return 2;
+        }
+        case COLSHAPE_CUBOID:
+        {
+            CVector size = static_cast<CClientColCuboid*>(pColShape)->GetSize();
+            lua_pushnumber(luaVM, size.fX);
+            lua_pushnumber(luaVM, size.fY);
+            lua_pushnumber(luaVM, size.fZ);
+            return 3;
+        }
+        case COLSHAPE_TUBE:
+        {
+            float fHeight = static_cast<CClientColTube*>(pColShape)->GetHeight();
+            lua_pushnumber(luaVM, fHeight);
+            return 1;
+        }
+    }
+
+    argStream.SetCustomError("ColShape must be Rectangle, Cuboid or Tube");
+    return luaL_error(luaVM, argStream.GetFullErrorMessage());
+}
+
+int CLuaColShapeDefs::OOP_GetColShapeSize(lua_State* luaVM)
+{
+    CClientColShape* pColShape;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+
     if (argStream.HasErrors())
         return luaL_error(luaVM, argStream.GetFullErrorMessage());
 

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

@@ -27,7 +27,7 @@ class CLuaColShapeDefs : public CLuaDefs
 
     LUA_DECLARE(GetColShapeRadius);
     LUA_DECLARE(SetColShapeRadius);
-    LUA_DECLARE(GetColShapeSize);
+    LUA_DECLARE_OOP(GetColShapeSize);
     LUA_DECLARE(SetColShapeSize);
     LUA_DECLARE(GetColPolygonPoints);
     LUA_DECLARE(GetColPolygonPointPosition);

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

@@ -57,7 +57,7 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
 
     lua_classfunction(luaVM, "getRadius", "getColShapeRadius", GetColShapeRadius);
     lua_classfunction(luaVM, "setRadius", "setColShapeRadius", SetColShapeRadius);
-    lua_classfunction(luaVM, "getSize", "getColShapeSize", GetColShapeSize);
+    lua_classfunction(luaVM, "getSize", "getColShapeSize", OOP_GetColShapeSize);
     lua_classfunction(luaVM, "setSize", "setColShapeSize", SetColShapeSize);
     lua_classfunction(luaVM, "getPoints", "getColPolygonPoints", GetColPolygonPoints);
     lua_classfunction(luaVM, "getPointPosition", "getColPolygonPointPosition", GetColPolygonPointPosition);
@@ -68,7 +68,7 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
 
     lua_classvariable(luaVM, "radius", "setColShapeRadius", "getColShapeRadius", SetColShapeRadius, GetColShapeRadius);
-    lua_classvariable(luaVM, "size", "setColShapeSize", "getColShapeSize", SetColShapeSize, GetColShapeSize);
+    lua_classvariable(luaVM, "size", "setColShapeSize", "getColShapeSize", SetColShapeSize, OOP_GetColShapeSize);
     lua_classvariable(luaVM, "points", nullptr, "getColPolygonPoints", nullptr, GetColPolygonPoints);
 
     lua_registerclass(luaVM, "ColShape", "Element");
@@ -436,6 +436,45 @@ int CLuaColShapeDefs::GetColShapeSize(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pColShape);
 
+    if (argStream.HasErrors())
+        return luaL_error(luaVM, argStream.GetFullErrorMessage());
+
+    switch (pColShape->GetShapeType())
+    {
+        case COLSHAPE_RECTANGLE:
+        {
+            CVector2D size = static_cast<CColRectangle*>(pColShape)->GetSize();
+            lua_pushnumber(luaVM, size.fX);
+            lua_pushnumber(luaVM, size.fY);
+            return 2;
+        }
+        case COLSHAPE_CUBOID:
+        {
+            CVector size = static_cast<CColCuboid*>(pColShape)->GetSize();
+            lua_pushnumber(luaVM, size.fX);
+            lua_pushnumber(luaVM, size.fY);
+            lua_pushnumber(luaVM, size.fZ);
+            return 3;
+        }
+        case COLSHAPE_TUBE:
+        {
+            float fHeight = static_cast<CColTube*>(pColShape)->GetHeight();
+            lua_pushnumber(luaVM, fHeight);
+            return 1;
+        }
+    }
+
+    argStream.SetCustomError("ColShape must be Rectangle, Cuboid or Tube");
+    return luaL_error(luaVM, argStream.GetFullErrorMessage());
+}
+
+int CLuaColShapeDefs::OOP_GetColShapeSize(lua_State* luaVM)
+{
+    CColShape* pColShape;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+
     if (argStream.HasErrors())
         return luaL_error(luaVM, argStream.GetFullErrorMessage());
 

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

@@ -28,7 +28,7 @@ class CLuaColShapeDefs : public CLuaDefs
 
     LUA_DECLARE(GetColShapeRadius);
     LUA_DECLARE(SetColShapeRadius);
-    LUA_DECLARE(GetColShapeSize);
+    LUA_DECLARE_OOP(GetColShapeSize);
     LUA_DECLARE(SetColShapeSize);
     LUA_DECLARE(GetColPolygonPoints);
     LUA_DECLARE(GetColPolygonPointPosition);