fixes for spelunky 2 v1.21.0c

spelunky-fyi · May 10, 2021 · 8072426 · 8072426
1 parent 08c1778
commit 8072426
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/3rdParty/overlunky b/3rdParty/overlunky
diff --git a/injected/include/SeedFinder.h b/injected/include/SeedFinder.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <nlohmann/json.hpp>
 #include <vector>
+#include <fmt/format.h>
 
 using json = nlohmann::json;
 

diff --git a/injected/include/SeedFinderUI.h b/injected/include/SeedFinderUI.h
@@ -19,7 +19,7 @@ namespace SeedFinder
 
       private:
         static bool processKeys(UINT nCode, WPARAM wParam, LPARAM lParam);
-        static void initImGui();
+        static void initImGui(struct ImGuiContext*);
         static void draw();
         static void postDraw();
         static void mouseActivity();

diff --git a/injected/src/CMakeLists.txt b/injected/src/CMakeLists.txt
@@ -49,4 +49,5 @@ target_sources(Spelunky2SeedFinderInjected
         ../../3rdParty/overlunky/src/game_api/thread_utils.cpp
         ../../3rdParty/overlunky/src/game_api/render_api.cpp
         ../../3rdParty/overlunky/src/game_api/window_api.cpp
+        ../../3rdParty/overlunky/src/game_api/game_manager.cpp
 )
diff --git a/injected/src/SeedFinder.cpp b/injected/src/SeedFinder.cpp
@@ -821,7 +821,6 @@ namespace SeedFinder
         case 21:
             return WarpInfo(7, 4, THEME_HUNDUN);
         default:
-            DEBUG("Invalid depth level specified");
             return WarpInfo(1, 1, THEME_DWELLING);
         }
     }

diff --git a/injected/src/SeedFinderUI.cpp b/injected/src/SeedFinderUI.cpp
@@ -25,7 +25,7 @@ namespace SeedFinder
         register_post_draw(&postDraw);
     }
 
-    void SeedFinderUI::initImGui()
+    void SeedFinderUI::initImGui(struct ImGuiContext*)
     {
         ImGuiIO& io = ImGui::GetIO();
         io.FontAllowUserScaling = true;
+1 −0		.gitattributes
+1 −1		.github/workflows/build.yml
+1 −1		.github/workflows/whip-build.yml
+6 −0		.gitmodules
+19 −5		CMakeLists.txt
+22 −20		README.md
+103 −22		docs/generate.py
+5,462 −0		docs/internal/entity.type.default_flags_more_flags.txt
+950 −0		docs/internal/entity.type.draw_depth.txt
+2,990 −0		docs/internal/entity.type.properties_flags.txt
+695 −268		docs/script-api.md
+10 −0		examples/anothermod.lua
+57 −0		examples/checkpoint.lua
+19 −0		examples/death_warp.lua
+42 −5		examples/drawing.lua
+36 −0		examples/drunk_dash.lua
+880 −0		examples/duatris.lua
+69 −0		examples/entity_info.lua
+ −		examples/fart.wav
+88 −0		examples/gps2.lua
+38 −0		examples/guns.lua
+11 −0		examples/jetpackfuel.lua
+ −		examples/loading.png
+7 −1		examples/metadata.lua
+47 −0		examples/olmec.lua
+33 −0		examples/options.lua
+ −		examples/pre_fart.wav
+2 −2		examples/projectile_randomizer.lua
+137 −0		examples/rando/container.lua
+270 −0		examples/rando/door.lua
+194 −0		examples/rando/enemy.lua
+56 −0		examples/rando/projectile.lua
+155 −0		examples/rando/trap.lua
+72 −7		examples/randomizer.lua
+18 −0		examples/rearm_arrowtraps.lua
+12 −0		examples/require.lua
+176 −65		examples/reverse.lua
+24 −0		examples/save_load.lua
+70 −0		examples/sound_test.lua
+103 −0		examples/sound_test_2.lua
+42 −0		examples/sparktrap_mayhem.lua
+ −		examples/stupid.mp3
+89 −0		examples/tas_test.lua
+7 −0		examples/testlib/mod.lua
+13 −0		examples/vlads_cape.lua
+118 −0		examples/window.lua
+39 −7		src/CMakeLists.txt
+26 −4		src/game_api/CMakeLists.txt
+24 −0		src/game_api/audio_buffer.hpp
+120 −10		src/game_api/entity.cpp
+49 −9		src/game_api/entity.hpp
+481 −0		src/game_api/flags.hpp
+490 −0		src/game_api/fmod.hpp
+14 −0		src/game_api/game_manager.cpp
+14 −0		src/game_api/game_manager.hpp
+1 −0		src/game_api/layer.cpp
+0 −1		src/game_api/layer.hpp
+4 −0		src/game_api/memory.hpp
+121 −6		src/game_api/movable.hpp
+5 −0		src/game_api/overloaded.hpp
+349 −30		src/game_api/rpc.cpp
+21 −6		src/game_api/rpc.hpp
+35 −0		src/game_api/savedata.hpp
+2,405 −0		src/game_api/script.cpp
+95 −0		src/game_api/script.hpp
+45 −0		src/game_api/script_context.cpp
+28 −0		src/game_api/script_context.hpp
+6 −6		src/game_api/search.hpp
+812 −0		src/game_api/sound_manager.cpp
+235 −0		src/game_api/sound_manager.hpp
+113 −42		src/game_api/state.cpp
+60 −12		src/game_api/state.hpp
+7,762 −0		src/game_api/stb_image.h
+22 −0		src/game_api/texture.cpp
+27 −0		src/game_api/texture.hpp
+31 −4		src/game_api/thread_utils.hpp
+115 −3		src/game_api/window_api.cpp
+7 −3		src/game_api/window_api.hpp
+10 −0		src/info_dump/CMakeLists.txt
+192 −0		src/info_dump/main.cpp
+5 −6		src/injected/CMakeLists.txt
+31 −0		src/injected/decode_audio_file.cpp
+5 −0		src/injected/decode_audio_file.hpp
+43 −28		src/injected/main.cpp
+0 −1,027		src/injected/script.cpp
+0 −120		src/injected/script.hpp
+789 −431		src/injected/ui.cpp
+7 −6		src/injector/CMakeLists.txt
+2 −1		src/injector/injector.h
+22 −4		src/injector/main.cpp
+1 −0		src/json
+1 −0		src/libnyquist
+8 −0		src/spel2_dll/CMakeLists.txt
+194 −0		src/spel2_dll/spel2.cpp
+111 −0		src/spel2_dll/spel2.h