From 7a84cc04096dd1917e4a14bfd71b186278b24941 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:54:34 +0200
Subject: [PATCH] Revert "Cache result of evaluating strategicmap.lua (#32)"

This reverts commit 8f22d13fd9d28c7a2a5b65ec1d10239615e9fa80.
---
 Strategic/LuaInitNPCs.cpp | 57 +++++++++++++++------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp
index be83d7576..519dc0050 100644
--- a/Strategic/LuaInitNPCs.cpp
+++ b/Strategic/LuaInitNPCs.cpp
@@ -13603,58 +13603,43 @@ static int l_GetNumHostilesInSector( lua_State *L )
 
 void LuaGetIntelAndQuestMapData( INT32 aLevel )
 {
-	static LuaScopeState _LS(true);
-	static bool isInitialized = false;
+	const char* filename = "scripts\\strategicmap.lua";
 
-	// Initialize only once during lifetime of program
-	if (!isInitialized)
-	{
-		isInitialized = true;
-		IniFunction(_LS.L(), TRUE);
-		IniGlobalGameSetting(_LS.L());
-		const char* filename = "scripts\\strategicmap.lua";
-		SGP_THROW_IFFALSE(_LS.L.EvalFile(filename), _BS("Cannot open file: ") << filename << _BS::cget);
-	}
+	LuaScopeState _LS( true );
+
+	IniFunction( _LS.L(), TRUE );
+	IniGlobalGameSetting( _LS.L() );
+
+	SGP_THROW_IFFALSE( _LS.L.EvalFile( filename ), _BS( "Cannot open file: " ) << filename << _BS::cget );
 
-	IniGlobalGameSetting(_LS.L());
 	LuaFunction( _LS.L, "GetIntelAndQuestMapData" ).Param<int>( aLevel ).Call( 1 );
 }
 
 void SetFactoryLeftoverProgress( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ, UINT16 usFacilityType, UINT16 usProductionNumber, INT32 sProgressLeft )
 {
-	static LuaScopeState _LS(true);
-	static bool isInitialized = false;
+	const char* filename = "scripts\\strategicmap.lua";
 
-	// Initialize only once during lifetime of program
-	if (!isInitialized)
-	{
-		isInitialized = true;
-		IniFunction(_LS.L(), TRUE);
-		IniGlobalGameSetting(_LS.L());
-		const char* filename = "scripts\\strategicmap.lua";
-		SGP_THROW_IFFALSE(_LS.L.EvalFile(filename), _BS("Cannot open file: ") << filename << _BS::cget);
-	}
+	LuaScopeState _LS( true );
+
+	IniFunction( _LS.L(), TRUE );
+	IniGlobalGameSetting( _LS.L() );
+
+	SGP_THROW_IFFALSE( _LS.L.EvalFile( filename ), _BS( "Cannot open file: " ) << filename << _BS::cget );
 
-	IniGlobalGameSetting(_LS.L());
 	LuaFunction( _LS.L, "SetFactoryLeftoverProgress" ).Param<int>( sSectorX ).Param<int>( sSectorY ).Param<int>( bSectorZ ).Param<int>( usFacilityType ).Param<int>( usProductionNumber ).Param<int>( sProgressLeft ).Call( 6 );
 }
 
 INT32 GetFactoryLeftoverProgress( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ, UINT16 usFacilityType, UINT16 usProductionNumber )
 {
-	static LuaScopeState _LS( true );
-	static bool isInitialized = false;
+	const char* filename = "scripts\\strategicmap.lua";
 
-	// Initialize only once during lifetime of program
-	if (!isInitialized)
-	{
-		isInitialized = true;
-		IniFunction( _LS.L(), TRUE );
-		IniGlobalGameSetting(_LS.L());
-		const char* filename = "scripts\\strategicmap.lua";
-		SGP_THROW_IFFALSE( _LS.L.EvalFile( filename ), _BS( "Cannot open file: " ) << filename << _BS::cget );
-	}
+	LuaScopeState _LS( true );
+
+	IniFunction( _LS.L(), TRUE );
+	IniGlobalGameSetting( _LS.L() );
+
+	SGP_THROW_IFFALSE( _LS.L.EvalFile( filename ), _BS( "Cannot open file: " ) << filename << _BS::cget );
 
-	IniGlobalGameSetting(_LS.L());
 	LuaFunction( _LS.L, "GetFactoryLeftoverProgress" ).Param<int>( sSectorX ).Param<int>( sSectorY ).Param<int>( bSectorZ ).Param<int>( usFacilityType ).Param<int>( usProductionNumber ).Call( 5 );
 	
 	if ( lua_gettop( _LS.L() ) >= 0 )