Merge branch 'develop' into adv-beta

DFHack · Nov 12, 2024 · 6694c78 · 6694c78
2 parents 732ad0e + 9e9f059
commit 6694c78
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.29.3
+  rev: 0.29.4
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

diff --git a/docs/about/Authors.rst b/docs/about/Authors.rst
@@ -172,6 +172,7 @@ PopnROFL                PopnROFL
 potato
 ppaawwll                ppaawwll                🐇🐇🐇🐇
 Priit Laes              plaes
+Przemysław Skrobot      frogi16
 psychowico              wiktor-obrebski
 Putnam                  Putnam3145
 quarque2                quarque2

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
@@ -43,6 +43,7 @@ distribution.
 #include "modules/Burrows.h"
 #include "modules/Constructions.h"
 #include "modules/Designations.h"
+#include "modules/DFSDL.h"
 #include "modules/EventManager.h"
 #include "modules/Filesystem.h"
 #include "modules/Gui.h"

diff --git a/library/include/modules/Graphic.h b/library/include/modules/Graphic.h
@@ -33,11 +33,13 @@ distribution.
 #include <stdint.h>
 #include "Export.h"
 #include "Module.h"
-#include "DFSDL.h"
 #include <vector>
 
 namespace DFHack
 {
+    // forward declaration used here instead of including DFSDL.h to reduce inclusion loading
+    struct DFTileSurface;
+
     class DFHACK_EXPORT Graphic : public Module
     {
         public:

diff --git a/library/xml b/library/xml
diff --git a/plugins/lua/preserve-rooms.lua b/plugins/lua/preserve-rooms.lua
@@ -114,10 +114,10 @@ ReservedWidget.ATTRS{
 new_world_loaded = true
 
 local CONFLICTING_TOOLTIPS = utils.invert{
-    df.main_hover_instruction.ZoneRepaint,
-    df.main_hover_instruction.ZoneSuspend,
-    df.main_hover_instruction.ZoneRemove,
-    df.main_hover_instruction.ZoneAssignLocation,
+    df.main_hover_instruction.ZONE_REPAINT,
+    df.main_hover_instruction.ZONE_SUSPEND,
+    df.main_hover_instruction.ZONE_REMOVE_EXISTING,
+    df.main_hover_instruction.ZONE_ASSIGN_LOCATION,
 }
 
 function ReservedWidget:init()

diff --git a/scripts b/scripts