Merge branch 'develop' into sdl_console

dhthwy · dhthwy · commit bbed0af47969 · 2025-09-20T15:28:16.000-04:00
diff --git a/library/modules/Burrows.cpp b/library/modules/Burrows.cpp
@@ -99,8 +99,6 @@ bool Burrows::isAssignedUnit(df::burrow *burrow, df::unit *unit)
 
 void Burrows::setAssignedUnit(df::burrow *burrow, df::unit *unit, bool enable)
 {
-    using df::global::plotinfo;
-
     CHECK_NULL_POINTER(unit);
     CHECK_NULL_POINTER(burrow);
 
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1679,8 +1679,8 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
                 continue;
         }
 
-        using df::global::cur_year;
-        using df::global::cur_year_tick;
+        //using df::global::cur_year;
+        //using df::global::cur_year_tick;
 
         send_unit->set_age(Units::getAge(unit, false));
 

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,6 @@ bool Burrows::isAssignedUnit(df::burrow burrow, df::unit unit)`
`99`	`99`
`100`	`100`	`void Burrows::setAssignedUnit(df::burrow burrow, df::unit unit, bool enable)`
`101`	`101`	`{`
`102`		`- using df::global::plotinfo;`
`103`		`-`
`104`	`102`	`CHECK_NULL_POINTER(unit);`
`105`	`103`	`CHECK_NULL_POINTER(burrow);`
`106`	`104`
Original file line number	Diff line number	Diff line change
`@@ -1679,8 +1679,8 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques`
`1679`	`1679`	`continue;`
`1680`	`1680`	`}`
`1681`	`1681`
`1682`		`- using df::global::cur_year;`
`1683`		`- using df::global::cur_year_tick;`
	`1682`	`+ //using df::global::cur_year;`
	`1683`	`+ //using df::global::cur_year_tick;`
`1684`	`1684`
`1685`	`1685`	`send_unit->set_age(Units::getAge(unit, false));`
`1686`	`1686`