[Freeciv-commits] r25171 - in /trunk/data: alien/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Tue Jun 17 11:07:14 2014 New Revision: 25171 URL: http://svn.gna.org/viewcvs/freeciv?rev=25171view=rev Log: Clarify function of NoVeteran flag in ruleset comments. See gna bug #22200. Modified: trunk/data/alien/units.ruleset trunk/data/civ2civ3/units.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/units.ruleset Modified: trunk/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=25171r1=25170r2=25171view=diff == --- trunk/data/alien/units.ruleset (original) +++ trunk/data/alien/units.ruleset Tue Jun 17 11:07:14 2014 @@ -295,7 +295,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: trunk/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=25171r1=25170r2=25171view=diff == --- trunk/data/civ2civ3/units.ruleset (original) +++ trunk/data/civ2civ3/units.ruleset Tue Jun 17 11:07:14 2014 @@ -337,7 +337,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: trunk/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=25171r1=25170r2=25171view=diff == --- trunk/data/classic/units.ruleset(original) +++ trunk/data/classic/units.rulesetTue Jun 17 11:07:14 2014 @@ -314,7 +314,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: trunk/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=25171r1=25170r2=25171view=diff == --- trunk/data/experimental/units.ruleset (original) +++ trunk/data/experimental/units.ruleset Tue Jun 17 11:07:14 2014 @@ -328,7 +328,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: trunk/data/multiplayer/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=25171r1=25170r2=25171view=diff == --- trunk/data/multiplayer/units.ruleset(original) +++ trunk/data/multiplayer/units.rulesetTue Jun 17 11:07:14 2014 @@
[Freeciv-commits] r25170 - in /trunk/data: civ1/units.ruleset civ2/units.ruleset
Author: jtn Date: Tue Jun 17 11:07:10 2014 New Revision: 25170 URL: http://svn.gna.org/viewcvs/freeciv?rev=25170view=rev Log: Reduce strength of veteran Diplomats in civ1/civ2 back to 2.3 levels. See gna bug #22202. Modified: trunk/data/civ1/units.ruleset trunk/data/civ2/units.ruleset Modified: trunk/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=25170r1=25169r2=25170view=diff == --- trunk/data/civ1/units.ruleset (original) +++ trunk/data/civ1/units.ruleset Tue Jun 17 11:07:10 2014 @@ -1163,6 +1163,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Explorer, Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ Modified: trunk/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=25170r1=25169r2=25170view=diff == --- trunk/data/civ2/units.ruleset (original) +++ trunk/data/civ2/units.ruleset Tue Jun 17 11:07:10 2014 @@ -1863,6 +1863,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25175 - in /trunk/data: civ2civ3/units.ruleset classic/units.ruleset experimental/units.ruleset multiplayer/units.ruleset
Author: jtn Date: Tue Jun 17 11:07:27 2014 New Revision: 25175 URL: http://svn.gna.org/viewcvs/freeciv?rev=25175view=rev Log: Add single-level veteran systems to all units that had no way to achieve veterancy in practice, so that the help and UI reflects this. See gna bug #22203. Modified: trunk/data/civ2civ3/units.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/units.ruleset Modified: trunk/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=25175r1=25174r2=25175view=diff == --- trunk/data/civ2civ3/units.ruleset (original) +++ trunk/data/civ2civ3/units.ruleset Tue Jun 17 11:07:27 2014 @@ -425,7 +425,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, AddToCity, Cities, NoVeteran +flags = Settlers, NonMil, AddToCity, Cities +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Cities helptext = _(\ Settlers are one of the key units in the game. As well as building new\ @@ -460,7 +466,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, AddToCity, NoVeteran, Capturable +flags = Settlers, NonMil, AddToCity, Capturable +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Settlers helptext = _(\ Migrants are like Workers in that they can improve terrain.\ @@ -493,7 +505,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, Airbase, NoVeteran +flags = Settlers, NonMil, Airbase +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Settlers helptext = _(\ Workers are similar to Settlers in that they can improve terrain --\ @@ -2000,6 +2018,12 @@ uk_food = 0 uk_gold = 1 flags = FieldUnit, OneAttack, Nuclear, AirAttacker +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = helptext = _(\ You can start building Nuclear units when you have the required\ @@ -2333,8 +2357,13 @@ uk_food = 0 uk_gold = 0 flags = IgZOC, NonMil, NoBuild, NoHome, SuperSpy, -Undisbandable, Unbribable, GameLoss, Unique, -NoVeteran +Undisbandable, Unbribable, GameLoss, Unique +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = GameLoss helptext = _(\ This is you. If you lose this unit, you lose the game. So don't.\ @@ -2367,6 +2396,12 @@ uk_gold = 0 flags = IgZOC, NonMil, Unbribable, Undisbandable, SuperSpy, NoHome, NoBuild +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = BarbarianLeader helptext = _(\ One Barbarian Leader appears every time there is a barbarian uprising\ Modified: trunk/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=25175r1=25174r2=25175view=diff == --- trunk/data/classic/units.ruleset(original) +++ trunk/data/classic/units.rulesetTue Jun 17 11:07:27 2014 @@ -42,7 +42,7 @@ ; The percentage chance of a settler/engineer increasing level through ; performing useful work (per turn) -veteran_work_raise_chance = 5, 3, 1, 0 +veteran_work_raise_chance = 0, 0, 0, 0 ; Power factors are as a percentage. ; +50% is represented by 150 @@ -402,7 +402,13 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 -flags = Settlers, NonMil, AddToCity, Cities, NoVeteran +flags = Settlers, NonMil, AddToCity, Cities +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Cities helptext = _(\ Settlers are one of the key units in the game. As well as building new\ @@ -440,7 +446,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 -flags = Settlers, NonMil, Airbase, NoVeteran +flags =
[Freeciv-commits] r25174 - /trunk/client/helpdata.c
Author: jtn
Date: Tue Jun 17 11:07:24 2014
New Revision: 25174
URL: http://svn.gna.org/viewcvs/freeciv?rev=25174view=rev
Log:
Fix help not to suppress veteran information for NoVeteran units (since
they may become veteran by other means than experience).
See gna bug #22201.
Modified:
trunk/client/helpdata.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25174r1=25173r2=25174view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Tue Jun 17 11:07:24 2014
@@ -2726,7 +2726,7 @@
char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer,
const char *user_text, struct unit_type *utype)
{
- bool can_be_veteran;
+ bool has_vet_levels;
int flagid;
fc_assert_ret_val(NULL != buf 0 bufsz NULL != user_text, NULL);
@@ -2737,8 +2737,7 @@
return buf;
}
- can_be_veteran = !utype_has_flag(utype, UTYF_NO_VETERAN)
- utype_veteran_levels(utype) 1;
+ has_vet_levels = utype_veteran_levels(utype) 1;
buf[0] = '\0';
@@ -3277,8 +3276,8 @@
action_prepare_ui_name(act, , ));
}
} action_iterate_end;
- if (!can_be_veteran) {
-/* Only mention this if the game generally has veteran levels. */
+ if (!has_vet_levels) {
+/* Only mention this if the game generally does have veteran levels. */
if (game.veteran-levels 1) {
CATLSTR(buf, bufsz, _(* Will never achieve veteran status.\n));
}
@@ -3293,7 +3292,8 @@
#endif
/* FIXME: if we knew the raise chances on the client, we could be
* more specific here about whether veteran status can be acquired
- * through combat/missions/work. */
+ * through combat/missions/work. Should also take into account
+ * UTYF_NO_VETERAN when writing this text. (Gna patch #4794) */
CATLSTR(buf, bufsz, _(* May acquire veteran status.\n));
if (utype_veteran_has_power_bonus(utype)) {
if ((!utype_has_flag(utype, UTYF_NUCLEAR) utype-attack_strength 0)
@@ -3322,7 +3322,7 @@
if (strlen(buf) 0) {
CATLSTR(buf, bufsz, \n);
}
- if (can_be_veteran utype-veteran) {
+ if (has_vet_levels utype-veteran) {
/* The case where the unit has only a single veteran level has already
* been handled above, so keep quiet here if that happens */
if (insert_veteran_help(buf, bufsz, utype-veteran,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25173 - /trunk/common/unittype.c
Author: jtn
Date: Tue Jun 17 11:07:20 2014
New Revision: 25173
URL: http://svn.gna.org/viewcvs/freeciv?rev=25173view=rev
Log:
Don't suppress display of veteran level for NoVeteran units.
See gna bug #22199.
Modified:
trunk/common/unittype.c
Modified: trunk/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=25173r1=25172r2=25173view=diff
==
--- trunk/common/unittype.c (original)
+++ trunk/common/unittype.c Tue Jun 17 11:07:20 2014
@@ -1179,8 +1179,7 @@
const char *utype_veteran_name_translation(const struct unit_type *punittype,
int level)
{
- if (utype_has_flag(punittype, UTYF_NO_VETERAN)
- || utype_veteran_levels(punittype) = 1) {
+ if (utype_veteran_levels(punittype) = 1) {
return NULL;
} else {
const struct veteran_level *vlvl = utype_veteran_level(punittype, level);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25172 - in /trunk: client/gui-gtk-2.0/editprop.c client/gui-gtk-3.0/editprop.c server/edithand.c
Author: jtn
Date: Tue Jun 17 11:07:17 2014
New Revision: 25172
URL: http://svn.gna.org/viewcvs/freeciv?rev=25172view=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=25172r1=25171r2=25172view=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=25172r1=25171r2=25172view=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=25172r1=25171r2=25172view=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
[Freeciv-commits] r25176 - in /branches/S2_5/data: civ1/units.ruleset civ2/units.ruleset
Author: jtn Date: Tue Jun 17 11:07:57 2014 New Revision: 25176 URL: http://svn.gna.org/viewcvs/freeciv?rev=25176view=rev Log: Reduce strength of veteran Diplomats in civ1/civ2 back to 2.3 levels. See gna bug #22202. Modified: branches/S2_5/data/civ1/units.ruleset branches/S2_5/data/civ2/units.ruleset Modified: branches/S2_5/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=25176r1=25175r2=25176view=diff == --- branches/S2_5/data/civ1/units.ruleset (original) +++ branches/S2_5/data/civ1/units.ruleset Tue Jun 17 11:07:57 2014 @@ -1162,6 +1162,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Explorer, Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ Modified: branches/S2_5/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/units.ruleset?rev=25176r1=25175r2=25176view=diff == --- branches/S2_5/data/civ2/units.ruleset (original) +++ branches/S2_5/data/civ2/units.ruleset Tue Jun 17 11:07:57 2014 @@ -1862,6 +1862,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25177 - in /branches/S2_5/data: alien/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Tue Jun 17 11:08:00 2014 New Revision: 25177 URL: http://svn.gna.org/viewcvs/freeciv?rev=25177view=rev Log: Clarify function of NoVeteran flag in ruleset comments. See gna bug #22200. Modified: branches/S2_5/data/alien/units.ruleset branches/S2_5/data/civ2civ3/units.ruleset branches/S2_5/data/classic/units.ruleset branches/S2_5/data/experimental/units.ruleset branches/S2_5/data/multiplayer/units.ruleset Modified: branches/S2_5/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/units.ruleset?rev=25177r1=25176r2=25177view=diff == --- branches/S2_5/data/alien/units.ruleset (original) +++ branches/S2_5/data/alien/units.ruleset Tue Jun 17 11:08:00 2014 @@ -293,7 +293,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=25177r1=25176r2=25177view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Tue Jun 17 11:08:00 2014 @@ -334,7 +334,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_5/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=25177r1=25176r2=25177view=diff == --- branches/S2_5/data/classic/units.ruleset(original) +++ branches/S2_5/data/classic/units.rulesetTue Jun 17 11:08:00 2014 @@ -311,7 +311,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_5/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=25177r1=25176r2=25177view=diff == --- branches/S2_5/data/experimental/units.ruleset (original) +++ branches/S2_5/data/experimental/units.ruleset Tue Jun 17 11:08:00 2014 @@ -325,7 +325,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_5/data/multiplayer/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=25177r1=25176r2=25177view=diff
[Freeciv-commits] r25178 - in /branches/S2_5: client/gui-gtk-2.0/editprop.c client/gui-gtk-3.0/editprop.c server/edithand.c
Author: jtn
Date: Tue Jun 17 11:08:04 2014
New Revision: 25178
URL: http://svn.gna.org/viewcvs/freeciv?rev=25178view=rev
Log:
Allow setting veteran level for NoVeteran units in editor.
See gna bug #22198.
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=25178r1=25177r2=25178view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/editprop.c Tue Jun 17 11:08:04 2014
@@ -1881,11 +1881,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: 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=25178r1=25177r2=25178view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/editprop.c Tue Jun 17 11:08:04 2014
@@ -1881,11 +1881,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: branches/S2_5/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/edithand.c?rev=25178r1=25177r2=25178view=diff
==
--- branches/S2_5/server/edithand.c (original)
+++ branches/S2_5/server/edithand.c Tue Jun 17 11:08:04 2014
@@ -854,8 +854,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
[Freeciv-commits] r25179 - /branches/S2_5/common/unittype.c
Author: jtn
Date: Tue Jun 17 11:08:07 2014
New Revision: 25179
URL: http://svn.gna.org/viewcvs/freeciv?rev=25179view=rev
Log:
Don't suppress display of veteran level for NoVeteran units.
See gna bug #22199.
Modified:
branches/S2_5/common/unittype.c
Modified: branches/S2_5/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unittype.c?rev=25179r1=25178r2=25179view=diff
==
--- branches/S2_5/common/unittype.c (original)
+++ branches/S2_5/common/unittype.c Tue Jun 17 11:08:07 2014
@@ -1183,8 +1183,7 @@
const char *utype_veteran_name_translation(const struct unit_type *punittype,
int level)
{
- if (utype_has_flag(punittype, UTYF_NO_VETERAN)
- || utype_veteran_levels(punittype) = 1) {
+ if (utype_veteran_levels(punittype) = 1) {
return NULL;
} else {
const struct veteran_level *vlvl = utype_veteran_level(punittype, level);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25180 - /branches/S2_5/client/helpdata.c
Author: jtn
Date: Tue Jun 17 11:08:10 2014
New Revision: 25180
URL: http://svn.gna.org/viewcvs/freeciv?rev=25180view=rev
Log:
Fix help not to suppress veteran information for NoVeteran units (since
they may become veteran by other means than experience).
See gna bug #22201.
Modified:
branches/S2_5/client/helpdata.c
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=25180r1=25179r2=25180view=diff
==
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Tue Jun 17 11:08:10 2014
@@ -2116,7 +2116,7 @@
char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer,
const char *user_text, struct unit_type *utype)
{
- bool can_be_veteran;
+ bool has_vet_levels;
int flagid;
fc_assert_ret_val(NULL != buf 0 bufsz NULL != user_text, NULL);
@@ -2127,8 +2127,7 @@
return buf;
}
- can_be_veteran = !utype_has_flag(utype, UTYF_NO_VETERAN)
- utype_veteran_levels(utype) 1;
+ has_vet_levels = utype_veteran_levels(utype) 1;
buf[0] = '\0';
@@ -2636,8 +2635,8 @@
astr_free(list);
}
}
- if (!can_be_veteran) {
-/* Only mention this if the game generally has veteran levels. */
+ if (!has_vet_levels) {
+/* Only mention this if the game generally does have veteran levels. */
if (game.veteran-levels 1) {
CATLSTR(buf, bufsz, _(* Will never achieve veteran status.\n));
}
@@ -2652,7 +2651,8 @@
#endif
/* FIXME: if we knew the raise chances on the client, we could be
* more specific here about whether veteran status can be acquired
- * through combat/missions/work. */
+ * through combat/missions/work. Should also take into account
+ * UTYF_NO_VETERAN when writing this text. (Gna patch #4794) */
CATLSTR(buf, bufsz, _(* May acquire veteran status.\n));
if (utype_veteran_has_power_bonus(utype)) {
if ((!utype_has_flag(utype, UTYF_NUCLEAR) utype-attack_strength 0)
@@ -2681,7 +2681,7 @@
if (strlen(buf) 0) {
CATLSTR(buf, bufsz, \n);
}
- if (can_be_veteran utype-veteran) {
+ if (has_vet_levels utype-veteran) {
/* The case where the unit has only a single veteran level has already
* been handled above, so keep quiet here if that happens */
if (insert_veteran_help(buf, bufsz, utype-veteran,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25181 - in /branches/S2_5/data: civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Tue Jun 17 11:08:13 2014 New Revision: 25181 URL: http://svn.gna.org/viewcvs/freeciv?rev=25181view=rev Log: Add single-level veteran systems to all units that had no way to achieve veterancy in practice, so that the help and UI reflects this. See gna bug #22203. Modified: branches/S2_5/data/civ2civ3/units.ruleset branches/S2_5/data/classic/units.ruleset branches/S2_5/data/experimental/units.ruleset branches/S2_5/data/multiplayer/units.ruleset Modified: branches/S2_5/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=25181r1=25180r2=25181view=diff == --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Tue Jun 17 11:08:13 2014 @@ -422,7 +422,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, AddToCity, Cities, NoVeteran +flags = Settlers, NonMil, AddToCity, Cities +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Cities helptext = _(\ Settlers are one of the key units in the game. As well as building new\ @@ -457,7 +463,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, AddToCity, NoVeteran, Capturable +flags = Settlers, NonMil, AddToCity, Capturable +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Settlers helptext = _(\ Migrants are like Workers in that they can improve terrain.\ @@ -490,7 +502,13 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 -flags = Settlers, NonMil, Airbase, NoVeteran +flags = Settlers, NonMil, Airbase +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Settlers helptext = _(\ Workers are similar to Settlers in that they can improve terrain --\ @@ -1997,6 +2015,12 @@ uk_food = 0 uk_gold = 1 flags = FieldUnit, OneAttack, Nuclear, AirAttacker +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = helptext = _(\ You can start building Nuclear units when you have the required\ @@ -2330,8 +2354,13 @@ uk_food = 0 uk_gold = 0 flags = IgZOC, NonMil, NoBuild, NoHome, SuperSpy, -Undisbandable, Unbribable, GameLoss, Unique, -NoVeteran +Undisbandable, Unbribable, GameLoss, Unique +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = GameLoss helptext = _(\ This is you. If you lose this unit, you lose the game. So don't.\ @@ -2364,6 +2393,12 @@ uk_gold = 0 flags = IgZOC, NonMil, Unbribable, Undisbandable, SuperSpy, NoHome, NoBuild +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = BarbarianLeader helptext = _(\ One Barbarian Leader appears every time there is a barbarian uprising\ Modified: branches/S2_5/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=25181r1=25180r2=25181view=diff == --- branches/S2_5/data/classic/units.ruleset(original) +++ branches/S2_5/data/classic/units.rulesetTue Jun 17 11:08:13 2014 @@ -41,7 +41,7 @@ ; The percentage chance of a settler/engineer increasing level through ; performing useful work (per turn) -veteran_work_raise_chance = 5, 3, 1, 0 +veteran_work_raise_chance = 0, 0, 0, 0 ; Power factors are as a percentage. ; +50% is represented by 150 @@ -399,7 +399,13 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 -flags = Settlers, NonMil, AddToCity, Cities, NoVeteran +flags = Settlers, NonMil, AddToCity, Cities +; No veteran levels (level name is never displayed) +veteran_names = _(green) +veteran_raise_chance = 0 +veteran_work_raise_chance = 0 +veteran_power_fact = 100 +veteran_move_bonus = 0 roles = Cities helptext = _(\ Settlers are one of the key units in the game. As well as building new\ @@ -437,7 +443,13 @@ uk_shield = 1 uk_food = 0
[Freeciv-commits] r25183 - in /branches/S2_4/data: default/units.ruleset experimental/units.ruleset multiplayer/units.ruleset
Author: jtn Date: Tue Jun 17 11:11:55 2014 New Revision: 25183 URL: http://svn.gna.org/viewcvs/freeciv?rev=25183view=rev Log: Clarify function of NoVeteran flag in ruleset comments. See gna bug #22200. Modified: branches/S2_4/data/default/units.ruleset branches/S2_4/data/experimental/units.ruleset branches/S2_4/data/multiplayer/units.ruleset Modified: branches/S2_4/data/default/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/default/units.ruleset?rev=25183r1=25182r2=25183view=diff == --- branches/S2_4/data/default/units.ruleset(original) +++ branches/S2_4/data/default/units.rulesetTue Jun 17 11:11:55 2014 @@ -252,7 +252,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_4/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/experimental/units.ruleset?rev=25183r1=25182r2=25183view=diff == --- branches/S2_4/data/experimental/units.ruleset (original) +++ branches/S2_4/data/experimental/units.ruleset Tue Jun 17 11:11:55 2014 @@ -266,7 +266,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots Modified: branches/S2_4/data/multiplayer/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/multiplayer/units.ruleset?rev=25183r1=25182r2=25183view=diff == --- branches/S2_4/data/multiplayer/units.ruleset(original) +++ branches/S2_4/data/multiplayer/units.rulesetTue Jun 17 11:11:55 2014 @@ -252,7 +252,9 @@ ; NoHome = this unit has no homecity and will be free of all upkeep, and ;therefore will not revolt along with its city of origin should ;it be incited -; NoVeteran = this unit cannot become veteran +; NoVeteran = this unit cannot gain veteran levels through experience +; (as if both raise_chance and work_raise_chance were zero); +; it can still gain veterancy through Veteran_Build, etc ; Bombarder = this unit cannot kill other units, only damage them, but ; also is not harmed by return fire when attacking; the field ; bombard_rate regulates its number of shots ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25182 - in /branches/S2_4/data: civ1/units.ruleset civ2/units.ruleset
Author: jtn Date: Tue Jun 17 11:11:52 2014 New Revision: 25182 URL: http://svn.gna.org/viewcvs/freeciv?rev=25182view=rev Log: Reduce strength of veteran Diplomats in civ1/civ2 back to 2.3 levels. See gna bug #22202. Modified: branches/S2_4/data/civ1/units.ruleset branches/S2_4/data/civ2/units.ruleset Modified: branches/S2_4/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/civ1/units.ruleset?rev=25182r1=25181r2=25182view=diff == --- branches/S2_4/data/civ1/units.ruleset (original) +++ branches/S2_4/data/civ1/units.ruleset Tue Jun 17 11:11:52 2014 @@ -1103,6 +1103,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Explorer, Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ Modified: branches/S2_4/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/civ2/units.ruleset?rev=25182r1=25181r2=25182view=diff == --- branches/S2_4/data/civ2/units.ruleset (original) +++ branches/S2_4/data/civ2/units.ruleset Tue Jun 17 11:11:52 2014 @@ -1784,6 +1784,11 @@ uk_food = 0 uk_gold = 0 flags = Diplomat, IgZOC, NonMil, NoVeteran +veteran_names = _(green), _(veteran) +veteran_raise_chance = 0, 0 +veteran_work_raise_chance = 0, 0 +veteran_power_fact = 100, 110 +veteran_move_bonus = 0, 0 roles = Diplomat helptext = _(\ A Diplomat is an official that carries your dispatches and\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25184 - in /branches/S2_4: client/gui-gtk-2.0/editprop.c client/gui-gtk-3.0/editprop.c server/edithand.c
Author: jtn
Date: Tue Jun 17 11:11:59 2014
New Revision: 25184
URL: http://svn.gna.org/viewcvs/freeciv?rev=25184view=rev
Log:
Allow setting veteran level for NoVeteran units in editor.
See gna bug #22198.
Modified:
branches/S2_4/client/gui-gtk-2.0/editprop.c
branches/S2_4/client/gui-gtk-3.0/editprop.c
branches/S2_4/server/edithand.c
Modified: branches/S2_4/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/editprop.c?rev=25184r1=25183r2=25184view=diff
==
--- branches/S2_4/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_4/client/gui-gtk-2.0/editprop.c Tue Jun 17 11:11:59 2014
@@ -1866,11 +1866,7 @@
return TRUE;
case OPID_UNIT_VETERAN:
*pmin = 0;
-if (unit_has_type_flag(punit, F_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: branches/S2_4/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-3.0/editprop.c?rev=25184r1=25183r2=25184view=diff
==
--- branches/S2_4/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_4/client/gui-gtk-3.0/editprop.c Tue Jun 17 11:11:59 2014
@@ -1866,11 +1866,7 @@
return TRUE;
case OPID_UNIT_VETERAN:
*pmin = 0;
-if (unit_has_type_flag(punit, F_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: branches/S2_4/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/edithand.c?rev=25184r1=25183r2=25184view=diff
==
--- branches/S2_4/server/edithand.c (original)
+++ branches/S2_4/server/edithand.c Tue Jun 17 11:11:59 2014
@@ -726,8 +726,7 @@
changed = TRUE;
}
- if (packet-veteran != punit-veteran
- !unit_has_type_flag(punit, F_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
[Freeciv-commits] r25187 - in /branches/S2_4/data: default/effects.ruleset experimental/effects.ruleset multiplayer/effects.ruleset
Author: jtn
Date: Tue Jun 17 11:12:08 2014
New Revision: 25187
URL: http://svn.gna.org/viewcvs/freeciv?rev=25187view=rev
Log:
Prevent Nuclear units from being pointlessly built as veteran
(it has no effect).
Reported by 'vla22'.
See gna bug #22164.
Modified:
branches/S2_4/data/default/effects.ruleset
branches/S2_4/data/experimental/effects.ruleset
branches/S2_4/data/multiplayer/effects.ruleset
Modified: branches/S2_4/data/default/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/default/effects.ruleset?rev=25187r1=25186r2=25187view=diff
==
--- branches/S2_4/data/default/effects.ruleset (original)
+++ branches/S2_4/data/default/effects.ruleset Tue Jun 17 11:12:08 2014
@@ -721,6 +721,7 @@
{ type, name, range
UnitFlag, NonMil, Local
UnitFlag, NoVeteran, Local
+ UnitFlag, Nuclear, Local
}
[effect_airport_1]
Modified: branches/S2_4/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/experimental/effects.ruleset?rev=25187r1=25186r2=25187view=diff
==
--- branches/S2_4/data/experimental/effects.ruleset (original)
+++ branches/S2_4/data/experimental/effects.ruleset Tue Jun 17 11:12:08 2014
@@ -777,6 +777,7 @@
{ type, name, range
UnitFlag, NonMil, Local
UnitFlag, NoVeteran, Local
+ UnitFlag, Nuclear, Local
}
[effect_airport_1]
Modified: branches/S2_4/data/multiplayer/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/multiplayer/effects.ruleset?rev=25187r1=25186r2=25187view=diff
==
--- branches/S2_4/data/multiplayer/effects.ruleset (original)
+++ branches/S2_4/data/multiplayer/effects.ruleset Tue Jun 17 11:12:08 2014
@@ -746,6 +746,7 @@
{ type, name, range
UnitFlag, NonMil, Local
UnitFlag, NoVeteran, Local
+ UnitFlag, Nuclear, Local
}
[effect_airport_1]
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25185 - /branches/S2_4/common/unittype.c
Author: jtn
Date: Tue Jun 17 11:12:02 2014
New Revision: 25185
URL: http://svn.gna.org/viewcvs/freeciv?rev=25185view=rev
Log:
Don't suppress display of veteran level for NoVeteran units.
See gna bug #22199.
Modified:
branches/S2_4/common/unittype.c
Modified: branches/S2_4/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/unittype.c?rev=25185r1=25184r2=25185view=diff
==
--- branches/S2_4/common/unittype.c (original)
+++ branches/S2_4/common/unittype.c Tue Jun 17 11:12:02 2014
@@ -1157,8 +1157,7 @@
const char *utype_veteran_name_translation(const struct unit_type *punittype,
int level)
{
- if (utype_has_flag(punittype, F_NO_VETERAN)
- || utype_veteran_levels(punittype) = 1) {
+ if (utype_veteran_levels(punittype) = 1) {
return NULL;
} else {
const struct veteran_level *vlvl = utype_veteran_level(punittype, level);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25186 - /branches/S2_4/client/helpdata.c
Author: jtn
Date: Tue Jun 17 11:12:05 2014
New Revision: 25186
URL: http://svn.gna.org/viewcvs/freeciv?rev=25186view=rev
Log:
Fix help not to suppress veteran information for NoVeteran units (since
they may become veteran by other means than experience).
See gna bug #22201.
Modified:
branches/S2_4/client/helpdata.c
Modified: branches/S2_4/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/helpdata.c?rev=25186r1=25185r2=25186view=diff
==
--- branches/S2_4/client/helpdata.c (original)
+++ branches/S2_4/client/helpdata.c Tue Jun 17 11:12:05 2014
@@ -1831,7 +1831,7 @@
char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer,
const char *user_text, struct unit_type *utype)
{
- bool can_be_veteran;
+ bool has_vet_levels;
fc_assert_ret_val(NULL != buf 0 bufsz NULL != user_text, NULL);
@@ -1841,8 +1841,7 @@
return buf;
}
- can_be_veteran = !utype_has_flag(utype, F_NO_VETERAN)
- utype_veteran_levels(utype) 1;
+ has_vet_levels = utype_veteran_levels(utype) 1;
buf[0] = '\0';
@@ -2212,8 +2211,8 @@
astr_free(list);
}
}
- if (!can_be_veteran) {
-/* Only mention this if the game generally has veteran levels. */
+ if (!has_vet_levels) {
+/* Only mention this if the game generally does have veteran levels. */
if (game.veteran-levels 1) {
CATLSTR(buf, bufsz, _(* Will never achieve veteran status.\n));
}
@@ -2228,7 +2227,8 @@
#endif
/* FIXME: if we knew the raise chances on the client, we could be
* more specific here about whether veteran status can be acquired
- * through combat/missions/work. */
+ * through combat/missions/work. Should also take into account
+ * F_NO_VETERAN when writing this text. (Gna patch #4794) */
CATLSTR(buf, bufsz, _(* May acquire veteran status.\n));
if (utype_veteran_has_power_bonus(utype)) {
if ((!utype_has_flag(utype, F_NUCLEAR) utype-attack_strength 0)
@@ -2258,7 +2258,7 @@
if (strlen(buf) 0) {
CATLSTR(buf, bufsz, \n);
}
- if (can_be_veteran utype-veteran) {
+ if (has_vet_levels utype-veteran) {
/* The case where the unit has only a single veteran level has already
* been handled above, so keep quiet here if that happens */
if (insert_veteran_help(buf, bufsz, utype-veteran,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25188 - in /trunk/common/aicore: path_finding.c path_finding.h
Author: pepeto
Date: Tue Jun 17 14:09:37 2014
New Revision: 25188
URL: http://svn.gna.org/viewcvs/freeciv?rev=25188view=rev
Log:
Node behavior optimization in pathfinding:
* TB_NORMAL is set to zero ;
* node::can_invade is suppressed ;
* Do not calculate all cache values if we cannot enter the node at all.
See gna patch #4768
Modified:
trunk/common/aicore/path_finding.c
trunk/common/aicore/path_finding.h
Modified: trunk/common/aicore/path_finding.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/path_finding.c?rev=25188r1=25187r2=25188view=diff
==
--- trunk/common/aicore/path_finding.c (original)
+++ trunk/common/aicore/path_finding.c Tue Jun 17 14:09:37 2014
@@ -198,12 +198,6 @@
}
}
-/* Determine if we can enter the node at all. Set it as a macro, because it
- * is used as many node types (pf_normal_node, pf_danger_node,
- * and pf_fuel_node). */
-#define CAN_ENTER_NODE(node)\
- ((node)-can_invade TB_IGNORE != (node)-behavior)
-
static struct pf_path *
pf_path_new_to_start_tile(const struct pf_parameter *param);
static void pf_position_fill_start_tile(struct pf_position *pos,
@@ -226,7 +220,6 @@
unsigned status : 3; /* 'enum pf_node_status' really. */
/* Cached values */
- bool can_invade : 1;
unsigned node_known_type : 2; /* 'enum known_type' really. */
unsigned behavior : 2;/* 'enum tile_behavior' really. */
unsigned zoc_number : 2; /* 'enum pf_zoc_type' really. */
@@ -264,9 +257,10 @@
/
Calculates cached values of the target node. Set the node status to
- NS_INIT to avoid recalculating all values.
-/
-static void pf_normal_node_init(struct pf_normal_map *pfnm,
+ NS_INIT to avoid recalculating all values. Returns FALSE if we cannot
+ enter node (in this case, most of the cached values are not set).
+/
+static bool pf_normal_node_init(struct pf_normal_map *pfnm,
struct pf_normal_node *node,
struct tile *ptile)
{
@@ -277,20 +271,36 @@
fc_assert(NS_UNINIT == node-status);
/* Else, not a critical problem, but waste of time. */
#endif
+
+ node-status = NS_INIT;
+
+ /* Establish the tile behavior. */
+ if (NULL != params-get_TB) {
+node-behavior = params-get_TB(ptile, node-node_known_type, params);
+if (TB_IGNORE == node-behavior) {
+ return FALSE;
+} else if (NULL != params-can_invade_tile
+!params-can_invade_tile(params-owner, ptile)) {
+ /* Overwrite node behavior if we cannot invade it. */
+ node-behavior = TB_IGNORE;
+ return FALSE;
+}
+ } else if (NULL != params-can_invade_tile
+ !params-can_invade_tile(params-owner, ptile)) {
+node-behavior = TB_IGNORE;
+return FALSE;
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ } else {
+/* The default. */
+node-behavior = TB_NORMAL;
+#endif
+ }
/* Establish the known status of node. */
if (params-omniscience) {
node-node_known_type = TILE_KNOWN_SEEN;
} else {
node-node_known_type = tile_get_known(ptile, params-owner);
- }
-
- /* Establish the tile behavior. */
- if (NULL != params-get_TB) {
-node-behavior = params-get_TB(ptile, node-node_known_type, params);
- } else {
-/* The default. */
-node-behavior = TB_NORMAL;
}
/* ZOC_MINE means can move unrestricted from/into it, ZOC_ALLIED means
@@ -319,13 +329,7 @@
#endif
}
- if (NULL != params-can_invade_tile) {
-node-can_invade = params-can_invade_tile(params-owner, ptile);
- } else {
-node-can_invade = TRUE;
- }
-
- node-status = NS_INIT;
+ return TRUE;
}
/
@@ -581,14 +585,15 @@
continue;
}
+ /* Initialise target tile if necessary. */
if (node1-status == NS_UNINIT) {
/* Only initialize once. See comment for pf_normal_node_init().
* Node status step A. to B. */
-pf_normal_node_init(pfnm, node1, tile1);
- }
-
- /* Can we enter this tile at all? */
- if (!CAN_ENTER_NODE(node1)) {
+if (!pf_normal_node_init(pfnm, node1, tile1)) {
+ continue;
+}
+ } else if (TB_IGNORE == node1-behavior) {
+/* We cannot enter this tile at all! */
continue;
}
@@ -682,12 +687,12 @@
/* Start position is handled in every function calling this function. */
if (NS_UNINIT == node-status) {
/* Initialize the node, for doing the following tests. */
- pf_normal_node_init(pfnm, node, ptile);
-}
-
-/* Simpliciation: if we cannot enter this node at all, don't iterate the
- * whole
[Freeciv-commits] r25189 - in /trunk: common/Makefile.am utility/Makefile.am
Author: cazfi Date: Tue Jun 17 20:48:11 2014 New Revision: 25189 URL: http://svn.gna.org/viewcvs/freeciv?rev=25189view=rev Log: Do not list python scripts as source files. See bug #22183 Modified: trunk/common/Makefile.am trunk/utility/Makefile.am Modified: trunk/common/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/Makefile.am?rev=25189r1=25188r2=25189view=diff == --- trunk/common/Makefile.am(original) +++ trunk/common/Makefile.amTue Jun 17 20:48:11 2014 @@ -58,7 +58,6 @@ fc_types.h \ game.c \ game.h \ - generate_packets.py \ government.c\ government.h\ idex.c \ @@ -124,7 +123,9 @@ worklist.c \ worklist.h -EXTRA_DIST = packets.def +EXTRA_DIST = \ + packets.def \ + generate_packets.py libfreeciv_la_DEPENDENCIES = \ $(top_builddir)/utility/libcivutility.la \ Modified: trunk/utility/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/Makefile.am?rev=25189r1=25188r2=25189view=diff == --- trunk/utility/Makefile.am (original) +++ trunk/utility/Makefile.am Tue Jun 17 20:48:11 2014 @@ -23,7 +23,6 @@ fcintl.h\ fcthread.c \ fcthread.h \ - generate_specenum.py\ genhash.c \ genhash.h \ genlist.c \ @@ -67,6 +66,9 @@ md5.c \ md5.h +EXTRA_DIST = \ + generate_specenum.py + libcivutility_la_LIBADD = $(UTILITY_LIBS) BUILT_SOURCES = specenum_gen.h ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25191 - in /branches/S2_4: common/Makefile.am utility/Makefile.am
Author: cazfi Date: Tue Jun 17 20:48:22 2014 New Revision: 25191 URL: http://svn.gna.org/viewcvs/freeciv?rev=25191view=rev Log: Do not list python scripts as source files. See bug #22183 Modified: branches/S2_4/common/Makefile.am branches/S2_4/utility/Makefile.am Modified: branches/S2_4/common/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/Makefile.am?rev=25191r1=25190r2=25191view=diff == --- branches/S2_4/common/Makefile.am(original) +++ branches/S2_4/common/Makefile.amTue Jun 17 20:48:22 2014 @@ -44,7 +44,6 @@ fc_types.h \ game.c \ game.h \ - generate_packets.py \ government.c\ government.h\ idex.c \ @@ -99,7 +98,9 @@ version.c \ version.h -EXTRA_DIST = packets.def +EXTRA_DIST = \ + packets.def \ + generate_packets.py libfreeciv_la_DEPENDENCIES = \ $(top_builddir)/utility/libcivutility.la \ Modified: branches/S2_4/utility/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/utility/Makefile.am?rev=25191r1=25190r2=25191view=diff == --- branches/S2_4/utility/Makefile.am (original) +++ branches/S2_4/utility/Makefile.am Tue Jun 17 20:48:22 2014 @@ -21,7 +21,6 @@ fcintl.h\ fcthread.c \ fcthread.h \ - generate_specenum.py\ genhash.c \ genhash.h \ genlist.c \ @@ -61,6 +60,9 @@ md5.c \ md5.h +EXTRA_DIST = \ + generate_specenum.py + libcivutility_la_LIBADD = $(UTILITY_LIBS) BUILT_SOURCES = specenum_gen.h ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25190 - in /branches/S2_5: common/Makefile.am utility/Makefile.am
Author: cazfi Date: Tue Jun 17 20:48:17 2014 New Revision: 25190 URL: http://svn.gna.org/viewcvs/freeciv?rev=25190view=rev Log: Do not list python scripts as source files. See bug #22183 Modified: branches/S2_5/common/Makefile.am branches/S2_5/utility/Makefile.am Modified: branches/S2_5/common/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/Makefile.am?rev=25190r1=25189r2=25190view=diff == --- branches/S2_5/common/Makefile.am(original) +++ branches/S2_5/common/Makefile.amTue Jun 17 20:48:17 2014 @@ -46,7 +46,6 @@ fc_types.h \ game.c \ game.h \ - generate_packets.py \ government.c\ government.h\ idex.c \ @@ -106,7 +105,9 @@ version.c \ version.h -EXTRA_DIST = packets.def +EXTRA_DIST = \ + packets.def \ + generate_packets.py libfreeciv_la_DEPENDENCIES = \ $(top_builddir)/utility/libcivutility.la \ Modified: branches/S2_5/utility/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/Makefile.am?rev=25190r1=25189r2=25190view=diff == --- branches/S2_5/utility/Makefile.am (original) +++ branches/S2_5/utility/Makefile.am Tue Jun 17 20:48:17 2014 @@ -23,7 +23,6 @@ fcintl.h\ fcthread.c \ fcthread.h \ - generate_specenum.py\ genhash.c \ genhash.h \ genlist.c \ @@ -67,6 +66,9 @@ md5.c \ md5.h +EXTRA_DIST = \ + generate_specenum.py + libcivutility_la_LIBADD = $(UTILITY_LIBS) BUILT_SOURCES = specenum_gen.h ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25192 - in /trunk/ai/default: aiferry.c aitools.c
Author: persia
Date: Tue Jun 17 23:25:05 2014
New Revision: 25192
URL: http://svn.gna.org/viewcvs/freeciv?rev=25192view=rev
Log:
Consolidate AI ferry tests
Consider a unit a ferry if it can move in the ocean, and carry another
unit that is not a missile and either cannot move freely in the ocean
or requires fuel.
See patch #4681
Modified:
trunk/ai/default/aiferry.c
trunk/ai/default/aitools.c
Modified: trunk/ai/default/aiferry.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiferry.c?rev=25192r1=25191r2=25192view=diff
==
--- trunk/ai/default/aiferry.c (original)
+++ trunk/ai/default/aiferry.c Tue Jun 17 23:25:05 2014
@@ -145,18 +145,32 @@
/**
Should unit type be considered a ferry?
+
+ Ferries are units that can transport units over an ocean that
+ cannot move there themselves, either because they lack the ability
+ to move through an ocean or because they require fuel to do so.
+
+ The ability to transport Missiles is insufficient for a unit to be
+ considered a ferry: Missile-Carriers are more properly hunters.
**/
static bool dai_is_ferry_type(struct unit_type *pferry)
{
if (pferry-transport_capacity 0
- dai_uclass_move_type(utype_class(pferry)) != UMT_LAND) {
+ utype_class(pferry)-adv.sea_move != MOVE_NONE) {
unit_class_iterate(pclass) {
- enum unit_move_type mt = dai_uclass_move_type(pclass);
-
- if (mt == UMT_LAND
+ if (pclass-adv.land_move != MOVE_NONE
+ !uclass_has_flag(pclass, UCF_MISSILE)
can_unit_type_transport(pferry, pclass)) {
-/* Can transport some land moving unit. */
-return TRUE;
+if (pclass-adv.sea_move != MOVE_FULL) {
+ return TRUE;
+} else {
+ unit_type_iterate(putype) {
+if (utype_class(putype) == pclass
+ 0 != utype_fuel(putype)) {
+ return TRUE;
+}
+ } unit_type_iterate_end;
+}
}
} unit_class_iterate_end;
}
Modified: trunk/ai/default/aitools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitools.c?rev=25192r1=25191r2=25192view=diff
==
--- trunk/ai/default/aitools.c (original)
+++ trunk/ai/default/aitools.c Tue Jun 17 23:25:05 2014
@@ -493,7 +493,7 @@
* SINGLE_MOVE
/ unit_type(punit)-move_rate);
const bool barbarian = is_barbarian(unit_owner(punit));
- bool is_ferry = FALSE;
+ bool is_ferry;
struct unit_ai *unit_data = def_ai_unit_data(punit, ait);
struct player *pplayer = unit_owner(punit);
@@ -501,21 +501,9 @@
* for human players any more. */
fc_assert(pplayer-ai_controlled);
- if (unit_data-task != AIUNIT_HUNTER
- get_transporter_capacity(punit) 0) {
-unit_class_iterate(uclass) {
- enum unit_move_type mt = dai_uclass_move_type(uclass);
-
- /* FIXME: UMT_BOTH units need ferry only if they use fuel */
- if (can_unit_type_transport(unit_type(punit), uclass)
- (mt == UMT_LAND
- || (mt == UMT_BOTH
- !uclass_has_flag(uclass, UCF_MISSILE {
-is_ferry = TRUE;
-break;
- }
-} unit_class_iterate_end;
- }
+ /* If a unit is hunting, don't expect it to be a ferry. */
+ is_ferry = (unit_data-task != AIUNIT_HUNTER
+ dai_is_ferry(punit));
if (is_ferry) {
/* The destination may be a coastal land tile,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25194 - in /branches/S2_5: ./ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-qt/ client/gui-sdl/ client/gui-stu...
Author: cazfi Date: Wed Jun 18 01:49:27 2014 New Revision: 25194 URL: http://svn.gna.org/viewcvs/freeciv?rev=25194view=rev Log: Renamed automake variables with upper case suffix like _CFLAGS, but not related to actual automake object to such a names that they don't cause errors with automake-ng, which considers such suffices strictly reserved for itself. In most cases the suffix has just written in lower case. See patch #4795 Modified: branches/S2_5/client/Makefile.am branches/S2_5/client/gui-gtk-2.0/Makefile.am branches/S2_5/client/gui-gtk-3.0/Makefile.am branches/S2_5/client/gui-qt/Makefile.am branches/S2_5/client/gui-sdl/Makefile.am branches/S2_5/client/gui-stub/Makefile.am branches/S2_5/client/gui-xaw/Makefile.am branches/S2_5/configure.ac branches/S2_5/m4/fcdb-mysql.m4 branches/S2_5/m4/fcdb-sqlite3.m4 branches/S2_5/m4/ggz.m4 branches/S2_5/m4/gtk2-client.m4 branches/S2_5/m4/gtk3-client.m4 branches/S2_5/m4/mysql.m4 branches/S2_5/m4/postgres.m4 branches/S2_5/m4/qt-client.m4 branches/S2_5/m4/sdl-client.m4 branches/S2_5/m4/sqlite3.m4 branches/S2_5/m4/xaw-client.m4 branches/S2_5/tools/Makefile.am [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/client/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-gtk-2.0/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-gtk-3.0/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-qt/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-sdl/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-stub/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-stub/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/client/gui-xaw/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-xaw/Makefile.am?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/fcdb-mysql.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/fcdb-mysql.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/fcdb-sqlite3.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/fcdb-sqlite3.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/ggz.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/ggz.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/gtk2-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/gtk2-client.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/gtk3-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/gtk3-client.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/mysql.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/mysql.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/postgres.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/postgres.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/qt-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/qt-client.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/sdl-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/sdl-client.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/sqlite3.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/sqlite3.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/m4/xaw-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/xaw-client.m4?rev=25194r1=25193r2=25194view=diff Modified: branches/S2_5/tools/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/Makefile.am?rev=25194r1=25193r2=25194view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25193 - in /trunk: ./ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-qt/ client/gui-sdl/ client/gui-sdl2/ clien...
Author: cazfi Date: Wed Jun 18 01:49:19 2014 New Revision: 25193 URL: http://svn.gna.org/viewcvs/freeciv?rev=25193view=rev Log: Renamed automake variables with upper case suffix like _CFLAGS, but not related to actual automake object to such a names that they don't cause errors with automake-ng, which considers such suffices strictly reserved for itself. In most cases the suffix has just written in lower case. See patch #4795 Modified: trunk/client/Makefile.am trunk/client/gui-gtk-2.0/Makefile.am trunk/client/gui-gtk-3.0/Makefile.am trunk/client/gui-qt/Makefile.am trunk/client/gui-sdl/Makefile.am trunk/client/gui-sdl2/Makefile.am trunk/client/gui-stub/Makefile.am trunk/client/gui-xaw/Makefile.am trunk/configure.ac trunk/m4/fcdb-mysql.m4 trunk/m4/fcdb-sqlite3.m4 trunk/m4/ggz.m4 trunk/m4/gtk2-client.m4 trunk/m4/gtk3-client.m4 trunk/m4/mysql.m4 trunk/m4/postgres.m4 trunk/m4/qt-client.m4 trunk/m4/sdl-client.m4 trunk/m4/sdl2-client.m4 trunk/m4/sqlite3.m4 trunk/m4/xaw-client.m4 trunk/tools/Makefile.am [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-gtk-2.0/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-gtk-3.0/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-qt/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-sdl/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-sdl2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-stub/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/client/gui-xaw/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/Makefile.am?rev=25193r1=25192r2=25193view=diff Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/fcdb-mysql.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/fcdb-mysql.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/fcdb-sqlite3.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/fcdb-sqlite3.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/ggz.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/ggz.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/gtk2-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk2-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/gtk3-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/mysql.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/mysql.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/postgres.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/postgres.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/qt-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/qt-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/sdl-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/sdl-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/sdl2-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/sdl2-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/sqlite3.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/sqlite3.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/m4/xaw-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/xaw-client.m4?rev=25193r1=25192r2=25193view=diff Modified: trunk/tools/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=25193r1=25192r2=25193view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
