Make units on cities visible when city drawing is disabled

longturn · Aug 22, 2023 · 4ac69b2 · 4ac69b2
1 parent 0faf8a5
commit 4ac69b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/client/control.cpp b/client/control.cpp
@@ -791,8 +791,8 @@ unit *find_visible_unit(const ::tile *ptile)
     }
   }
 
-  // If a city is here, return nothing (unit hidden by city).
-  if (tile_city(ptile)) {
+  // If a city is here (and UI is drawing them), return nothing (unit hidden by city).
+  if (gui_options->draw_cities && tile_city(ptile)) {
     return nullptr;
   }
 

diff --git a/dist/freeciv21-server.cmd b/dist/freeciv21-server.cmd
@@ -1,3 +1,3 @@
-@echo off
-if not "%1" == "auto" set LANG=%1
-start "%~n0" /D . "%~dp0\freeciv21-server.exe" %2 %3 %4 %5 %6 %7 %8 %9
+@echo off
+if not "%1" == "auto" set LANG=%1
+start "%~n0" /D . "%~dp0\freeciv21-server.exe" %2 %3 %4 %5 %6 %7 %8 %9