Author: cazfi Date: Thu Nov 3 07:03:36 2016 New Revision: 34346 URL: http://svn.gna.org/viewcvs/freeciv?rev=34346&view=rev Log: Use correct factor in all situations when scaling down sdl-client citymap.
See bug #25251 Modified: branches/S2_5/client/gui-sdl/citydlg.c Modified: branches/S2_5/client/gui-sdl/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/citydlg.c?rev=34346&r1=34345&r2=34346&view=diff ============================================================================== --- branches/S2_5/client/gui-sdl/citydlg.c (original) +++ branches/S2_5/client/gui-sdl/citydlg.c Thu Nov 3 07:03:36 2016 @@ -62,8 +62,6 @@ #include "citydlg.h" /* ============================================================= */ -#define SCALLED_TILE_WIDTH 48 -#define SCALLED_TILE_HEIGHT 24 static struct city_dialog { struct city *pCity; @@ -1570,11 +1568,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); } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits