Author: jtn
Date: Tue Jun 17 11:07:17 2014
New Revision: 25172
URL: http://svn.gna.org/viewcvs/freeciv?rev=25172&view=rev
Log:
Allow setting veteran level for NoVeteran units in editor.
See gna bug #22198.
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=25172&r1=25171&r2=25172&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Tue Jun 17 11:07:17 2014
@@ -1892,11 +1892,7 @@
return TRUE;
case OPID_UNIT_VETERAN:
*pmin = 0;
- if (unit_has_type_flag(punit, UTYF_NO_VETERAN)) {
- *pmax = 0;
- } else {
- *pmax = utype_veteran_levels(putype) - 1;
- }
+ *pmax = utype_veteran_levels(putype) - 1;
*pstep = 1;
*pbig_step = 3;
return TRUE;
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=25172&r1=25171&r2=25172&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Tue Jun 17 11:07:17 2014
@@ -1892,11 +1892,7 @@
return TRUE;
case OPID_UNIT_VETERAN:
*pmin = 0;
- if (unit_has_type_flag(punit, UTYF_NO_VETERAN)) {
- *pmax = 0;
- } else {
- *pmax = utype_veteran_levels(putype) - 1;
- }
+ *pmax = utype_veteran_levels(putype) - 1;
*pstep = 1;
*pbig_step = 3;
return TRUE;
Modified: trunk/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=25172&r1=25171&r2=25172&view=diff
==============================================================================
--- trunk/server/edithand.c (original)
+++ trunk/server/edithand.c Tue Jun 17 11:07:17 2014
@@ -809,8 +809,7 @@
changed = TRUE;
}
- if (packet->veteran != punit->veteran
- && !unit_has_type_flag(punit, UTYF_NO_VETERAN)) {
+ if (packet->veteran != punit->veteran) {
int v = packet->veteran;
if (!utype_veteran_level(putype, v)) {
notify_conn(pc->self, NULL, E_BAD_COMMAND, ftc_editor,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
