Fix build and speedrun mode (#45)

* disable init in speedrun mode * fix runner? * make char json speedrun legal
spelunky-fyi · Feb 24, 2023 · 08628db · 08628db
1 parent f8fef0f
commit 08628db
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Prepare
         run: |
           python -m pip install --upgrade pip
-          pip install conan
+          pip install conan==1.59.0
 
       - name: Cache conan
         uses: actions/cache@v3

diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Prepare
         run: |
           python -m pip install --upgrade pip
-          pip install conan
+          pip install conan==1.59.0
 
       - name: Cache conan
         uses: actions/cache@v3

diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Prepare
         run: |
           python -m pip install --upgrade pip
-          pip install conan
+          pip install conan==1.59.0
 
       - name: Cache conan
         uses: actions/cache@v3

diff --git a/source/playlunky/mod/mod_manager.cpp b/source/playlunky/mod/mod_manager.cpp
@@ -900,6 +900,13 @@ ModManager::~ModManager()
 
 void ModManager::PostGameInit(const class PlaylunkySettings& settings)
 {
+    const bool speedrun_mode = settings.GetBool("general_settings", "speedrun_mode", false);
+
+    PatchCharacterDefinitions(mVfs, settings);
+
+    if (speedrun_mode)
+        return;
+
     Spelunky_InitState();
 
     const auto db_folder = mModsRoot / ".db";
@@ -911,8 +918,6 @@ void ModManager::PostGameInit(const class PlaylunkySettings& settings)
         mSpritePainter->FinalizeSetup(db_original_folder, db_folder);
     }
 
-    PatchCharacterDefinitions(mVfs, settings);
-
     // Sound manager has to be initialized before any scripts
     Spelunky_InitSoundManager([](const char* file_path)
                               {
@@ -925,12 +930,8 @@ void ModManager::PostGameInit(const class PlaylunkySettings& settings)
                                       .data_size{ buffer.DataSize }
                                   }; });
 
-    const bool speedrun_mode = settings.GetBool("general_settings", "speedrun_mode", false);
-    if (!speedrun_mode)
-    {
-        // Bugfixes may use scripts for some functionality
-        BugFixesInit(settings, db_folder, db_original_folder);
-    }
+    // Bugfixes may use scripts for some functionality
+    BugFixesInit(settings, db_folder, db_original_folder);
 
     mScriptManager.CommitScripts(settings);
 

diff --git a/submodules/overlunky b/submodules/overlunky
+12 −0		docs/examples/Hud.lua
+31 −0		docs/examples/ThemeInfo.lua
+893 −746		docs/game_data/spel2.lua
+251 −208		docs/generate_emmylua.py
+1,139 −210		docs/index.html
+1,139 −210		docs/light.html
+41 −6		docs/parse_source.py
+79 −56		docs/src/includes/_enums.md
+21 −4		docs/src/includes/_globals.md
+318 −82		docs/src/includes/_types.md
+11 −8		src/game_api/entity.cpp
+2 −2		src/game_api/level_api.cpp
+81 −123		src/game_api/level_api.hpp
+7 −5		src/game_api/movable.hpp
+7 −3		src/game_api/render_api.cpp
+88 −0		src/game_api/render_api.hpp
+12 −0		src/game_api/script/events.cpp
+3 −0		src/game_api/script/events.hpp
+24 −0		src/game_api/script/lua_backend.cpp
+3 −0		src/game_api/script/lua_backend.hpp
+23 −0		src/game_api/script/lua_vm.cpp
+6 −6		src/game_api/script/usertypes/behavior_lua.cpp
+57 −2		src/game_api/script/usertypes/entity_lua.cpp
+17 −20		src/game_api/script/usertypes/level_lua.cpp
+2 −1		src/game_api/script/usertypes/theme_vtable_lua.hpp
+52 −0		src/game_api/script/usertypes/vanilla_render_lua.cpp
+1 −1		src/game_api/script/usertypes/vtables_lua.cpp
+1 −1		src/info_dump/main.cpp
+0 −2		src/injected/ui.cpp