Author: mir3x
Date: Sun Feb 5 16:42:42 2017
New Revision: 34969
URL: http://svn.gna.org/viewcvs/freeciv?rev=34969&view=rev
Log:
Fixed some tileset variables which could be scaled 2 times.
Fixed wrong comparision.
See gna bug #25474
Modified:
branches/S3_0/client/tilespec.c
Modified: branches/S3_0/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/tilespec.c?rev=34969&r1=34968&r2=34969&view=diff
==============================================================================
--- branches/S3_0/client/tilespec.c (original)
+++ branches/S3_0/client/tilespec.c Sun Feb 5 16:42:42 2017
@@ -1941,10 +1941,10 @@
log_error("Tileset \"%s\" invalid: %s", t->name, secfile_error());
goto ON_ERROR;
}
- if (t->unit_tile_width != t->unit_tile_width && t->scale != 1.0f) {
+ if (t->unit_tile_width != t->full_tile_width && t->scale != 1.0f) {
t->unit_tile_width = ceil(t->unit_tile_width * t->scale);
}
- if (t->unit_tile_height != t->unit_tile_height && t->scale != 1.0f) {
+ if (t->unit_tile_height != t->full_tile_height && t->scale != 1.0f) {
t->unit_tile_height = ceil(t->unit_tile_height * t->scale);
}
t->small_sprite_width = t->small_sprite_width * t->scale;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
