Author: jtn
Date: Mon Feb  1 21:11:09 2016
New Revision: 31706

URL: http://svn.gna.org/viewcvs/freeciv?rev=31706&view=rev
Log:
Remove fallbacks for specific goto path sprites, now that all tilesets
have graphics for them.

See gna patch #6571.

Modified:
    branches/S2_6/client/tilespec.c

Modified: branches/S2_6/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=31706&r1=31705&r2=31706&view=diff
==============================================================================
--- branches/S2_6/client/tilespec.c     (original)
+++ branches/S2_6/client/tilespec.c     Mon Feb  1 21:11:09 2016
@@ -2836,6 +2836,10 @@
 
   SET_SPRITE(city.disorder, "city.disorder");
 
+  /* Fallbacks for goto path turn numbers:
+   *   path.step_%d, path.exhausted_mp_%d
+   *   --> path.turns_%d
+   *       --> city.size_%d */
 #define SET_GOTO_TURN_SPRITE(state, state_name, factor, factor_name)        \
   fc_snprintf(buffer, sizeof(buffer), "path." state_name "_%d" #factor, i); \
   SET_SPRITE_OPT(path.s[state].turns ## factor_name [i], buffer);           \
@@ -2908,25 +2912,11 @@
   t->max_upkeep_height = calculate_max_upkeep_height(t);
 
   SET_SPRITE(user.attention, "user.attention");
+
   SET_SPRITE_OPT(path.s[GTS_MP_LEFT].specific, "path.normal");
-  if (t->sprites.path.s[GTS_TURN_STEP].turns[0]
-      == t->sprites.path.s[GTS_MP_LEFT].turns[0]) {
-    /* No specific sprites for step turn numbers. */
-    SET_SPRITE_ALT(path.s[GTS_TURN_STEP].specific, "path.step",
-                   "user.attention");
-  } else {
-    SET_SPRITE_OPT(path.s[GTS_TURN_STEP].specific, "path.step");
-  }
-  if (t->sprites.path.s[GTS_EXHAUSTED_MP].turns[0]
-      == t->sprites.path.s[GTS_MP_LEFT].turns[0]) {
-    /* No specific sprites for exhausted move points turn numbers. */
-    SET_SPRITE_ALT(path.s[GTS_EXHAUSTED_MP].specific, "path.exhausted_mp",
-                   "unit.tired");
-  } else {
-    SET_SPRITE_OPT(path.s[GTS_EXHAUSTED_MP].specific, "path.exhausted_mp");
-  }
-  SET_SPRITE_ALT(path.waypoint, "path.waypoint", "editor.startpos");
-
+  SET_SPRITE_OPT(path.s[GTS_EXHAUSTED_MP].specific, "path.exhausted_mp");
+  SET_SPRITE_OPT(path.s[GTS_TURN_STEP].specific, "path.step");
+  SET_SPRITE(path.waypoint, "path.waypoint");
 
   SET_SPRITE(tx.fog,        "tx.fog");
 


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

Reply via email to