Merge remote-tracking branch 'origin/develop' into experimental

Author: myk002

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
 set(DF_VERSION "51.11")
-set(DFHACK_RELEASE "r1")
+set(DFHACK_RELEASE "r1.1")
 set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

data/art/design.png

@@ -67,6 +67,12 @@ Template for new versions:
 
 ## Removed
 
+# 51.11-r1.1
+
+## Fixes
+- `preserve-rooms`: will no longer crash when a civzone is assigned to a unit that does not exist
+- `gui/design`: fix misaligned shape icons
+
 # 51.11-r1
 
 ## Fixes
@@ -92,6 +98,7 @@ Template for new versions:
 
 ## Lua
 - ``dfhack.military.addToSquad``: expose Military API function
+- ``dfhack.buildings.getOwner``: make new Buildings API available to Lua
 
 # 51.10-r1
 

docs/changelog.txt

@@ -512,6 +512,10 @@ static void process_rooms(color_ostream &out,
             continue;
         }
         auto owner = Buildings::getOwner(zone);
+        if (!owner) {
+            WARN(cycle, out).print("building %d has owner id %d but no such unit exists\n", zone->id, zone->assigned_unit_id);
+            continue;
+        }
         auto hf = df::historical_figure::find(owner->hist_figure_id);
         if (!hf)
             continue;