Merge branch 'develop' into adv-beta

DFHack · Jan 14, 2025 · 5bd5f29 · 5bd5f29
2 parents 0c5819f + 072a5ea
commit 5bd5f29
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/library/Core.cpp b/library/Core.cpp
@@ -419,17 +419,13 @@ bool is_builtin(color_ostream &con, const std::string &command) {
 }
 
 void get_commands(color_ostream &con, std::vector<std::string> &commands) {
-#ifdef LINUX_BUILD
-    CoreSuspender suspend;
-#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Cannot acquire core lock in helpdb.get_commands\n");
         commands.clear();
         return;
     }
-#endif
 
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
@@ -630,16 +626,12 @@ static std::string sc_event_name (state_change_event id) {
 }
 
 void help_helper(color_ostream &con, const std::string &entry_name) {
-#ifdef LINUX_BUILD
-    CoreSuspender suspend;
-#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
         return;
     }
-#endif
 
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
@@ -658,16 +650,12 @@ void help_helper(color_ostream &con, const std::string &entry_name) {
 }
 
 void tags_helper(color_ostream &con, const std::string &tag) {
-#ifdef LINUX_BUILD
-    CoreSuspender suspend;
-#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
         return;
     }
-#endif
 
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
@@ -705,16 +693,12 @@ void ls_helper(color_ostream &con, const std::vector<std::string> &params) {
             filter.push_back(str);
     }
 
-#ifdef LINUX_BUILD
-    CoreSuspender suspend;
-#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
         return;
     }
-#endif
 
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);

diff --git a/library/include/Core.h b/library/include/Core.h
@@ -376,8 +376,6 @@ namespace DFHack
 
         void unlock()
         {
-            if (!owns_lock())
-                return;
             /* Restore core owner to previous value */
             if (tid == std::thread::id{})
                 Lua::Core::Reset(core.getConsole(), "suspend");
@@ -386,7 +384,8 @@ namespace DFHack
         }
 
         ~CoreSuspenderBase() {
-            unlock();
+            if (owns_lock())
+                unlock();
         }
 
     protected:
@@ -438,7 +437,8 @@ namespace DFHack
 
         // note that this is needed so the destructor will call CoreSuspender::unlock instead of CoreSuspenderBase::unlock
         ~CoreSuspender() {
-            unlock();
+            if (owns_lock())
+                unlock();
         }
 
     protected:

diff --git a/plugins/stonesense b/plugins/stonesense
diff --git a/scripts b/scripts
+2 −0		.gitignore
+1 −1		.pre-commit-config.yaml
+0 −2		CMakeLists.txt
+3 −5		Config.cpp
+4 −6		ContentBuildingReader.cpp
+22 −39		ContentLoader.cpp
+18 −28		ContentLoader.h
+0 −62		EnumToString.cpp
+0 −13		EnumToString.h
+3 −4		FluidConfiguration.cpp
+426 −785		GUI.cpp
+0 −3		GUI.h
+15 −53		GameBuildings.cpp
+239 −227		GroundMaterialConfiguration.cpp
+46 −7		GroundMaterialConfiguration.h
+1 −4		Keybinds.cpp
+11 −31		SpriteMaps.cpp
+14 −14		SpriteObjects.cpp
+3 −1		commonTypes.h
+9 −16		main.cpp