Author: cazfi
Date: Thu Nov 3 07:03:31 2016
New Revision: 34345
URL: http://svn.gna.org/viewcvs/freeciv?rev=34345&view=rev
Log:
Use correct factor in all situations when scaling down sdl-client citymap.
See bug #25251
Modified:
branches/S2_6/client/gui-sdl/citydlg.c
branches/S2_6/client/gui-sdl2/citydlg.c
Modified: branches/S2_6/client/gui-sdl/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/citydlg.c?rev=34345&r1=34344&r2=34345&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/citydlg.c (original)
+++ branches/S2_6/client/gui-sdl/citydlg.c Thu Nov 3 07:03:31 2016
@@ -63,8 +63,6 @@
#include "citydlg.h"
/* ============================================================= */
-#define SCALLED_TILE_WIDTH 48
-#define SCALLED_TILE_HEIGHT 24
static struct city_dialog {
struct city *pCity;
@@ -1572,11 +1570,11 @@
SDL_Surface *get_scaled_city_map(struct city *pCity)
{
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);
-
+
return zoomSurface(pBuf, city_map_zoom, city_map_zoom, 1);
}
Modified: branches/S2_6/client/gui-sdl2/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/citydlg.c?rev=34345&r1=34344&r2=34345&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/citydlg.c (original)
+++ branches/S2_6/client/gui-sdl2/citydlg.c Thu Nov 3 07:03:31 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;
@@ -1571,7 +1569,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
