Author: jtn
Date: Fri Dec 18 21:22:10 2015
New Revision: 31082
URL: http://svn.gna.org/viewcvs/freeciv?rev=31082&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:
branches/S2_5/client/gui-gtk-2.0/editprop.c
branches/S2_5/client/gui-gtk-3.0/editprop.c
branches/S2_5/server/edithand.c
Modified: branches/S2_5/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/editprop.c?rev=31082&r1=31081&r2=31082&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/editprop.c Fri Dec 18 21:22:10 2015
@@ -1869,7 +1869,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;
@@ -2871,6 +2871,7 @@
objprop_set_child_widget(op, "entry", entry);
return;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_SHIELD_STOCK:
case OPID_PLAYER_SCIENCE:
@@ -2883,7 +2884,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:
@@ -3055,6 +3055,7 @@
gtk_widget_set_sensitive(entry, pv != NULL);
break;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_SHIELD_STOCK:
case OPID_PLAYER_SCIENCE:
@@ -3077,7 +3078,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: branches/S2_5/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editprop.c?rev=31082&r1=31081&r2=31082&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/editprop.c Fri Dec 18 21:22:10 2015
@@ -1869,7 +1869,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;
@@ -2878,6 +2878,7 @@
objprop_set_child_widget(op, "entry", entry);
return;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_SHIELD_STOCK:
case OPID_PLAYER_SCIENCE:
@@ -2892,7 +2893,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:
@@ -3070,6 +3070,7 @@
gtk_widget_set_sensitive(entry, pv != NULL);
break;
+ case OPID_UNIT_MOVES_LEFT:
case OPID_CITY_SIZE:
case OPID_CITY_SHIELD_STOCK:
case OPID_PLAYER_SCIENCE:
@@ -3092,7 +3093,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: branches/S2_5/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/edithand.c?rev=31082&r1=31081&r2=31082&view=diff
==============================================================================
--- branches/S2_5/server/edithand.c (original)
+++ branches/S2_5/server/edithand.c Fri Dec 18 21:22:10 2015
@@ -828,9 +828,9 @@
putype = unit_type(punit);
if (has_capability("extended_move_rate", pc->capability)) {
- moves_left = CLIP(0, packet->moves_left_new, putype->move_rate);
+ moves_left = packet->moves_left_new;
} else {
- moves_left = CLIP(0, packet->moves_left_old, putype->move_rate);
+ moves_left = packet->moves_left_old;
}
if (moves_left != punit->moves_left) {
punit->moves_left = moves_left;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
