Fixed ConvertLuaTableToVectorOfType() to work with non-pointer types

Author: Causeless

Source/Lua/LuaAdapters.cpp

@@ -613,11 +613,7 @@ std::list<Entity*>* LuaAdaptersPresetMan::GetAllEntitiesOfGroup(PresetMan& prese
 }
 
 MOID LuaAdaptersSceneMan::CastMORay1(SceneMan& sceneMan, const Vector& start, const Vector& ray, const luabind::object& ignoreMOIDs, int ignoreTeam, unsigned char ignoreMaterial, bool ignoreAllTerrain, int skip) {
-	std::vector<MOID*> ptrVec = ConvertLuaTableToVectorOfType<MOID*>(ignoreMOIDs);
-	std::vector<MOID> ignoreMOIDsVec;
-	for (auto ptr : ptrVec) {
-		ignoreMOIDsVec.push_back(*ptr);
-	}
+	std::vector<MOID> ignoreMOIDsVec = ConvertLuaTableToVectorOfType<MOID>(ignoreMOIDs);
 	return sceneMan.CastMORay(start, ray, ignoreMOIDsVec, ignoreTeam, ignoreMaterial, ignoreAllTerrain, skip);
 }
 
@@ -627,20 +623,12 @@ MOID LuaAdaptersSceneMan::CastMORay2(SceneMan& sceneMan, const Vector& start, co
 }
 
 const std::vector<MovableObject*>* LuaAdaptersSceneMan::CastAllMOsRay(SceneMan& sceneMan, const Vector& start, const Vector& ray, const luabind::object& ignoreMOIDs, int ignoreTeam, unsigned char ignoreMaterial, bool ignoreAllTerrain, int skip) {
-	std::vector<MOID*> ptrVec = ConvertLuaTableToVectorOfType<MOID*>(ignoreMOIDs);
-	std::vector<MOID> ignoreMOIDsVec;
-	for (auto ptr : ptrVec) {
-		ignoreMOIDsVec.push_back(*ptr);
-	}
+	std::vector<MOID> ignoreMOIDsVec = ConvertLuaTableToVectorOfType<MOID>(ignoreMOIDs);
 	return sceneMan.CastAllMOsRay(start, ray, ignoreMOIDsVec, ignoreTeam, ignoreMaterial, ignoreAllTerrain, skip);
 }
 
 float LuaAdaptersSceneMan::CastObstacleRay1(SceneMan& sceneMan, const Vector& start, const Vector& ray, Vector& obstaclePos, Vector& freePos, const luabind::object& ignoreMOIDs, int ignoreTeam, unsigned char ignoreMaterial, int skip) {
-	std::vector<MOID*> ptrVec = ConvertLuaTableToVectorOfType<MOID*>(ignoreMOIDs);
-	std::vector<MOID> ignoreMOIDsVec;
-	for (auto ptr : ptrVec) {
-		ignoreMOIDsVec.push_back(*ptr);
-	}
+	std::vector<MOID> ignoreMOIDsVec = ConvertLuaTableToVectorOfType<MOID>(ignoreMOIDs);
 	return sceneMan.CastObstacleRay(start, ray, obstaclePos, freePos, ignoreMOIDsVec, ignoreTeam, ignoreMaterial, skip);
 }
 

Source/Lua/LuabindDefinitions.h

@@ -72,7 +72,11 @@ namespace RTE {
 		std::vector<Type> outVector = {};
 		if (luaObject.is_valid() && luabind::type(luaObject) == LUA_TTABLE) {
 			for (luabind::iterator tableItr(luaObject), tableEnd; tableItr != tableEnd; ++tableItr) {
-				outVector.emplace_back(luabind::object_cast<Type>(*tableItr, luabind::adopt(luabind::result)));
+				if constexpr (std::is_pointer_v<Type>) {
+					outVector.emplace_back(luabind::object_cast<Type>(*tableItr, luabind::adopt(luabind::result)));
+				} else {
+					outVector.emplace_back(luabind::object_cast<Type>(*tableItr));
+				}
 			}
 		}
 		return outVector;