Made sure the script was respected.

Author: Bit-Crust

Source/Activities/GAScripted.cpp

@@ -193,34 +193,12 @@ bool GAScripted::SceneIsCompatible(Scene* pScene, int teams) {
 	}
 
 	// If it hasn't been yet, run the file that specifies the Lua functions for this' operating logic (including the scene test function)
-	if (!g_LuaMan.GetMasterScriptState().GlobalIsDefined(m_LuaClassName)) {
-		// Temporarily store this Activity so the Lua state can access it
-		g_LuaMan.GetMasterScriptState().SetTempEntity(this);
-		// Define the var that will hold the script file definitions..
-		// it's OK if the script fails, then the scene is still deemed compatible
-		if (g_LuaMan.GetMasterScriptState().RunScriptString(m_LuaClassName + " = ToGameActivity(LuaMan.TempEntity);") < 0) {
-			return true;
-		}
-		// Load and run the file, defining all the scripted functions of this Activity
-		if (g_LuaMan.GetMasterScriptState().RunScriptFile(m_ScriptPath) < 0) {
-			return true;
-		}
-	}
+	RefreshActivityFunctions();
 
 	// Call the defined function, but only after first checking if it exists
-	bool conditionMet = false;
+	bool conditionMet = true;
 	int error = RunLuaConditionalTest("IsCompatibleScene", conditionMet, {pScene}, {}, {});
-	if (error < 0) {
-		RTEAbort("Error")
-		return false;
-	} else if (error == 0) {
-		//RTEAbort("Missing")
-		conditionMet = true;
-	} else {
-		RTEAbort("Passed")
-	}
-
-	if (!conditionMet) {
+	if (error < 0 || !conditionMet) {
 		return false;
 	}
 

Source/Managers/LuaMan.cpp

@@ -677,13 +677,14 @@ int LuaStateWrapper::RunScriptConditionalTestFunctionObject(const LuabindObjectW
 		ZoneName(path.c_str(), path.length());
 
 		if (lua_pcall(m_State, argumentCount, LUA_MULTRET, -argumentCount - 2) > 0) {
-			//returnParam = 1 == lua_toboolean(m_State, 1);
 			m_LastError = lua_tostring(m_State, -1);
 			lua_pop(m_State, 1);
 			g_ConsoleMan.PrintString("ERROR: " + m_LastError);
 			ClearErrors();
 			status = -1;
 		}
+		
+		returnParam = 1 == lua_toboolean(m_State, -1);
 	}
 	std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();