Author: jtn
Date: Fri Dec 18 21:02:12 2015
New Revision: 31075
URL: http://svn.gna.org/viewcvs/freeciv?rev=31075&view=rev
Log:
Remove editor's clipping of moves left to unit move_rate, since effects
and veterancy allow it to be greater.
See gna bug #24079.
Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/server/edithand.c
Modified: trunk/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editprop.c?rev=31075&r1=31074&r2=31075&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Fri Dec 18 21:02:12 2015
@@ -1899,7 +1899,7 @@
switch (propid) {
case OPID_UNIT_MOVES_LEFT:
*pmin = 0;
- *pmax = putype->move_rate;
+ *pmax = 65535; /* packets.def MOVEFRAGS */
*pstep = 1;
*pbig_step = 5;
return TRUE;
@@ -2944,6 +2944,7 @@
objprop_set_child_widget(op, "entry", entry);
return;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_HISTORY:
case OPID_CITY_SHIELD_STOCK:
@@ -2957,7 +2958,6 @@
objprop_set_child_widget(op, "spin", spin);
return;
- case OPID_UNIT_MOVES_LEFT:
case OPID_UNIT_FUEL:
case OPID_UNIT_HP:
case OPID_UNIT_VETERAN:
@@ -3134,6 +3134,7 @@
gtk_widget_set_sensitive(entry, pv != NULL);
break;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_HISTORY:
case OPID_CITY_SHIELD_STOCK:
@@ -3157,7 +3158,6 @@
gtk_widget_set_sensitive(spin, pv != NULL);
break;
- case OPID_UNIT_MOVES_LEFT:
case OPID_UNIT_FUEL:
case OPID_UNIT_HP:
case OPID_UNIT_VETERAN:
Modified: trunk/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=31075&r1=31074&r2=31075&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Fri Dec 18 21:02:12 2015
@@ -1899,7 +1899,7 @@
switch (propid) {
case OPID_UNIT_MOVES_LEFT:
*pmin = 0;
- *pmax = putype->move_rate;
+ *pmax = 65535; /* packets.def MOVEFRAGS */
*pstep = 1;
*pbig_step = 5;
return TRUE;
@@ -2951,6 +2951,7 @@
objprop_set_child_widget(op, "entry", entry);
return;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_HISTORY:
case OPID_CITY_SHIELD_STOCK:
@@ -2966,7 +2967,6 @@
objprop_set_child_widget(op, "spin", spin);
return;
- case OPID_UNIT_MOVES_LEFT:
case OPID_UNIT_FUEL:
case OPID_UNIT_HP:
case OPID_UNIT_VETERAN:
@@ -3149,6 +3149,7 @@
gtk_widget_set_sensitive(entry, pv != NULL);
break;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_HISTORY:
case OPID_CITY_SHIELD_STOCK:
@@ -3172,7 +3173,6 @@
gtk_widget_set_sensitive(spin, pv != NULL);
break;
- case OPID_UNIT_MOVES_LEFT:
case OPID_UNIT_FUEL:
case OPID_UNIT_HP:
case OPID_UNIT_VETERAN:
Modified: trunk/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=31075&r1=31074&r2=31075&view=diff
==============================================================================
--- trunk/server/edithand.c (original)
+++ trunk/server/edithand.c Fri Dec 18 21:02:12 2015
@@ -769,7 +769,7 @@
struct unit *punit;
int id;
bool changed = FALSE;
- int moves_left, fuel, hp;
+ int fuel, hp;
id = packet->id;
punit = game_unit_by_number(id);
@@ -781,9 +781,8 @@
putype = unit_type_get(punit);
- moves_left = CLIP(0, packet->moves_left, putype->move_rate);
- if (moves_left != punit->moves_left) {
- punit->moves_left = moves_left;
+ if (packet->moves_left != punit->moves_left) {
+ punit->moves_left = packet->moves_left;
changed = TRUE;
}
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
