Author: cazfi
Date: Wed Feb 25 23:16:32 2015
New Revision: 28315
URL: http://svn.gna.org/viewcvs/freeciv?rev=28315&view=rev
Log:
Changed spelling of happyborders option value "disable" to "disabled" to match
other similar
options.
See bug #23279
Modified:
trunk/data/civ2civ3/game.ruleset
trunk/server/settings.c
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=28315&r1=28314&r2=28315&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Wed Feb 25 23:16:32 2015
@@ -706,7 +706,7 @@
"sciencebox", 100
"borders", "ENABLED"
"foggedborders", "ENABLED"
- "happyborders", "DISABLE"
+ "happyborders", "DISABLED"
"restrictinfra", "ENABLED"
"unreachableprotects", "DISABLED"
"onsetbarbs", 120
Modified: trunk/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=28315&r1=28314&r2=28315&view=diff
==============================================================================
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Wed Feb 25 23:16:32 2015
@@ -353,7 +353,7 @@
static const struct sset_val_name *happyborders_name(int happyborders)
{
switch (happyborders) {
- NAME_CASE(HB_DISABLED, "DISABLE", N_("Borders are not helping"));
+ NAME_CASE(HB_DISABLED, "DISABLED", N_("Borders are not helping"));
NAME_CASE(HB_NATIONAL, "NATIONAL", N_("Happy within own borders"));
NAME_CASE(HB_ALLIANCE, "ALLIED", N_("Happy within allied borders"));
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
