ChaosMod/LuaScripts: Block WAIT during script evaluation as well

gta-chaos-mod · Jan 24, 2025 · ba4f88c · ba4f88c
1 parent 6b9c156
commit ba4f88c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ChaosMod/Components/LuaScripts.cpp b/ChaosMod/Components/LuaScripts.cpp
@@ -296,7 +296,6 @@ static const std::vector<ExposableFunc> ms_Exposables {
 	E("GET_HASH_KEY", GET_HASH_KEY),
 	E("print", [](const sol::this_environment &curEnv, const std::string &text)
 	  { LuaPrint(curEnv.env->get<sol::table>("EnvInfo")["ScriptName"], text); }),
-	E("WAIT", WAIT),
 	E("IsKeyPressed",
 	  [](unsigned char key)
 	  {
@@ -466,6 +465,7 @@ LuaScripts::LuaScripts()
 		{
 			return LuaInvoke(curEnv, hash, returnType, args);
 		};
+		m_GlobalState["WAIT"] = WAIT;
 	}
 	else
 	{
@@ -475,6 +475,10 @@ LuaScripts::LuaScripts()
 			LOG("WARNING: Blocked invocation of native 0x" << std::uppercase << std::hex << hash << std::setfill(' ')
 			                                               << " during script evaluation!");
 		};
+		m_GlobalState["WAIT"] = []()
+		{
+			LOG("WARNING: Blocked invocation of WAIT during script evaluation!");
+		};
 	}
 
 	for (auto dir : ms_ScriptDirs)
@@ -506,6 +510,7 @@ LuaScripts::LuaScripts()
 		{
 			return LuaInvoke(curEnv, hash, returnType, args);
 		};
+		m_GlobalState["WAIT"] = WAIT;
 	}
 }