Author: cazfi
Date: Thu Nov  3 07:03:21 2016
New Revision: 34344

URL: http://svn.gna.org/viewcvs/freeciv?rev=34344&view=rev
Log:
Use correct factor in all situations when scaling down sdl-client citymap.

See bug #25251

Modified:
    trunk/client/gui-sdl2/citydlg.c

Modified: trunk/client/gui-sdl2/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/citydlg.c?rev=34344&r1=34343&r2=34344&view=diff
==============================================================================
--- trunk/client/gui-sdl2/citydlg.c     (original)
+++ trunk/client/gui-sdl2/citydlg.c     Thu Nov  3 07:03:21 2016
@@ -67,8 +67,6 @@
 #include "citydlg.h"
 
 /* ============================================================= */
-#define SCALLED_TILE_WIDTH     48
-#define SCALLED_TILE_HEIGHT    24
 
 static struct city_dialog {
   struct city *pCity;
@@ -1570,7 +1568,7 @@
 {
   SDL_Surface *pBuf = create_city_map(pCity);
 
-  city_map_zoom = ((pBuf->w > pBuf->h) ?
+  city_map_zoom = ((pBuf->w * 159 > pBuf->h * 249) ?
                    (float)adj_size(249) / pBuf->w
                    : (float)adj_size(159) / pBuf->h);
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to