Add global scripts (#294)

CMakeLists.txt

@@ -267,6 +267,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/sfall_config.h"
     "src/sfall_global_vars.cc"
     "src/sfall_global_vars.h"
+    "src/sfall_global_scripts.cc"
+    "src/sfall_global_scripts.h"
     "src/sfall_ini.cc"
     "src/sfall_ini.h"
     "src/sfall_lists.cc"

src/combat.cc

@@ -37,6 +37,7 @@
 #include "scripts.h"
 #include "settings.h"
 #include "sfall_config.h"
+#include "sfall_global_scripts.h"
 #include "skill.h"
 #include "stat.h"
 #include "svga.h"
@@ -3144,6 +3145,10 @@ static int _combat_input()
         }
 
         int keyCode = inputGetInput();
+
+        // SFALL: CombatLoopHook.
+        sfall_gl_scr_process_main();
+
         if (_action_explode_running()) {
             // NOTE: Uninline.
             _combat_turn_run();

src/config.cc

@@ -397,7 +397,7 @@ static bool configParseLine(Config* config, char* string)
     // keys there.
 
     // Skip leading whitespace.
-    while (isspace(*string)) {
+    while (isspace(static_cast<unsigned char>(*string))) {
         string++;
     }
 
@@ -500,7 +500,7 @@ static bool configTrimString(char* string)
     // Starting from the end of the string, loop while it's a whitespace and
     // decrement string length.
     char* pch = string + length - 1;
-    while (length != 0 && isspace(*pch)) {
+    while (length != 0 && isspace(static_cast<unsigned char>(*pch))) {
         length--;
         pch--;
     }
@@ -511,7 +511,7 @@ static bool configTrimString(char* string)
     // Starting from the beginning of the string loop while it's a whitespace
     // and decrement string length.
     pch = string;
-    while (isspace(*pch)) {
+    while (isspace(static_cast<unsigned char>(*pch))) {
         pch++;
         length--;
     }

src/game.cc

@@ -52,6 +52,7 @@
 #include "settings.h"
 #include "sfall_arrays.h"
 #include "sfall_config.h"
+#include "sfall_global_scripts.h"
 #include "sfall_global_vars.h"
 #include "sfall_ini.h"
 #include "sfall_lists.h"
@@ -355,6 +356,11 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
         return -1;
     }
 
+    if (!sfall_gl_scr_init()) {
+        debugPrint("Failed on sfall_gl_scr_init");
+        return -1;
+    }
+
     char* customConfigBasePath;
     configGetString(&gSfallConfig, SFALL_CONFIG_SCRIPTS_KEY, SFALL_CONFIG_INI_CONFIG_FOLDER, &customConfigBasePath);
     sfall_ini_set_base_path(customConfigBasePath);
@@ -407,6 +413,7 @@ void gameReset()
     sfallListsReset();
     messageListRepositoryReset();
     sfallArraysReset();
+    sfall_gl_scr_reset();
 }
 
 // 0x442C34
@@ -415,6 +422,7 @@ void gameExit()
     debugPrint("\nGame Exit\n");
 
     // SFALL
+    sfall_gl_scr_exit();
     sfallArraysExit();
     sfallListsExit();
     sfallGlobalVarsExit();

src/interpreter.cc

@@ -43,7 +43,6 @@ static opcode_t programReturnStackPopInt16(Program* program);
 static int programReturnStackPopInt32(Program* program);
 static void _detachProgram(Program* program);
 static void _purgeProgram(Program* program);
-static void programFree(Program* program);
 static opcode_t _getOp(Program* program);
 static void programMarkHeap(Program* program);
 static void opNoop(Program* program);
@@ -421,7 +420,7 @@ static void _purgeProgram(Program* program)
 }
 
 // 0x467614
-static void programFree(Program* program)
+void programFree(Program* program)
 {
     // NOTE: Uninline.
     _detachProgram(program);

src/interpreter.h

@@ -204,6 +204,7 @@ void _interpretOutputFunc(int (*func)(char*));
 int _interpretOutput(const char* format, ...);
 [[noreturn]] void programFatalError(const char* str, ...);
 void _interpretDecStringRef(Program* program, opcode_t a2, int a3);
+void programFree(Program* program);
 Program* programCreateByPath(const char* path);
 char* programGetString(Program* program, opcode_t opcode, int offset);
 char* programGetIdentifier(Program* program, int offset);

src/loadsave.cc

@@ -45,6 +45,7 @@
 #include "random.h"
 #include "scripts.h"
 #include "settings.h"
+#include "sfall_global_scripts.h"
 #include "skill.h"
 #include "stat.h"
 #include "svga.h"
@@ -1676,6 +1677,9 @@ static int lsgLoadGameInSlot(int slot)
 
     _loadingGame = 0;
 
+    // SFALL: Start global scripts.
+    sfall_gl_scr_exec_start_proc();
+
     return 0;
 }
 

src/main.cc

@@ -33,6 +33,7 @@
 #include "selfrun.h"
 #include "settings.h"
 #include "sfall_config.h"
+#include "sfall_global_scripts.h"
 #include "svga.h"
 #include "text_font.h"
 #include "window.h"
@@ -148,6 +149,9 @@ int falloutMain(int argc, char** argv)
                     _main_load_new(mapNameCopy);
                     free(mapNameCopy);
 
+                    // SFALL: AfterNewGameStartHook.
+                    sfall_gl_scr_exec_start_proc();
+
                     mainLoop();
                     paletteFadeTo(gPaletteWhite);
 
@@ -357,6 +361,10 @@ static void mainLoop()
         sharedFpsLimiter.mark();
 
         int keyCode = inputGetInput();
+
+        // SFALL: MainLoopHook.
+        sfall_gl_scr_process_main();
+
         gameHandleKey(keyCode, false);
 
         scriptsHandleRequests();

src/scripts.cc

@@ -31,6 +31,7 @@
 #include "queue.h"
 #include "sfall_arrays.h"
 #include "sfall_config.h"
+#include "sfall_global_scripts.h"
 #include "stat.h"
 #include "svga.h"
 #include "tile.h"
@@ -145,7 +146,7 @@ static const int gGameTimeDaysPerMonth[12] = {
 };
 
 // 0x51C758
-static const char* gScriptProcNames[28] = {
+const char* gScriptProcNames[SCRIPT_PROC_COUNT] = {
     "no_p_proc",
     "start",
     "spatial_p_proc",
@@ -2589,6 +2590,9 @@ void scriptsExecMapUpdateProc()
 // 0x4A67EC
 void scriptsExecMapUpdateScripts(int proc)
 {
+    // SFALL: Run global scripts.
+    sfall_gl_scr_exec_map_update_scripts(proc);
+
     _scr_SpatialsEnabled = false;
 
     int fixedParam = 0;

src/scripts.h

@@ -145,6 +145,8 @@ typedef struct Script {
     int field_DC;
 } Script;
 
+extern const char* gScriptProcNames[SCRIPT_PROC_COUNT];
+
 int gameTimeGetTime();
 void gameTimeGetDate(int* monthPtr, int* dayPtr, int* yearPtr);
 int gameTimeGetHour();

src/sfall_config.cc

@@ -59,6 +59,7 @@ bool sfallConfigInit(int argc, char** argv)
     configSetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_MOVIE_TIMER_ARTIMER4, 360);
 
     configSetString(&gSfallConfig, SFALL_CONFIG_SCRIPTS_KEY, SFALL_CONFIG_INI_CONFIG_FOLDER, "");
+    configSetString(&gSfallConfig, SFALL_CONFIG_SCRIPTS_KEY, SFALL_CONFIG_GLOBAL_SCRIPT_PATHS, "");
 
     char path[COMPAT_MAX_PATH];
     char* executable = argv[0];

src/sfall_config.h

@@ -70,6 +70,7 @@ namespace fallout {
 #define SFALL_CONFIG_EXTRA_MESSAGE_LISTS_KEY "ExtraGameMsgFileList"
 #define SFALL_CONFIG_NUMBERS_IS_DIALOG_KEY "NumbersInDialogue"
 #define SFALL_CONFIG_INI_CONFIG_FOLDER "IniConfigFolder"
+#define SFALL_CONFIG_GLOBAL_SCRIPT_PATHS "GlobalScriptPaths"
 
 #define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_MULTIPLIER 1
 #define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_DIVISOR 3