Merge pull request #217 from patrikjuvonen/issue-9742

0009742: add support for Vec2s on createColPolygon client-side and allow passing in more Vec2s server-side

Author: qaisjp

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

@@ -255,6 +255,15 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadVector2D(vecPosition);
 
+    // Get the points
+    std::vector<CVector2D> vecPointList;
+    for (uint i = 0; i < 3 || argStream.NextIsVector2D(); i++)
+    {
+        CVector2D vecPoint;
+        argStream.ReadVector2D(vecPoint);
+        vecPointList.push_back(vecPoint);
+    }
+
     if (!argStream.HasErrors())
     {
         CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
@@ -267,11 +276,10 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
                 CClientColPolygon* pShape = CStaticFunctionDefinitions::CreateColPolygon(*pResource, vecPosition);
                 if (pShape)
                 {
-                    // Get the points
-                    while (argStream.NextCouldBeNumber() && argStream.NextCouldBeNumber(1))
+                    // Add the points
+                    for (uint i = 0; i < vecPointList.size(); i++)
                     {
-                        argStream.ReadVector2D(vecPosition);
-                        pShape->AddPoint(vecPosition);
+                        pShape->AddPoint(vecPointList[i]);
                     }
 
                     CElementGroup* pGroup = pResource->GetElementGroup();

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

@@ -249,7 +249,7 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
     std::vector<CVector2D> vecPointList;
 
     CScriptArgReader argStream(luaVM);
-    for (uint i = 0; i < 4 || argStream.NextCouldBeNumber(); i++)
+    for (uint i = 0; i < 4 || argStream.NextIsVector2D(); i++)
     {
         CVector2D vecPoint;
         argStream.ReadVector2D(vecPoint);