[Freeciv-commits] r32912 - /branches/S2_5/utility/fcintl.c

[cazfi74]

Author: cazfi
Date: Sun Jun 19 05:04:41 2016
New Revision: 32912

URL: http://svn.gna.org/viewcvs/freeciv?rev=32912&view=rev
Log:
Comment typofix: "animales" -> "animals"

Modified:
branches/S2_5/utility/fcintl.c

Modified: branches/S2_5/utility/fcintl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/fcintl.c?rev=32912&r1=32911&r2=32912&view=diff
==
--- branches/S2_5/utility/fcintl.c  (original)
+++ branches/S2_5/utility/fcintl.c  Sun Jun 19 05:04:41 2016
@@ -30,7 +30,7 @@
 To distinguish strings for translation, we qualify them with a prefix
 string of the form "?qualifier:".  So, the above two cases might be:
   "Game"   -- when used as meaning something you play
-  "?animals:Game"  -- when used as animales to be hunted
+  "?animals:Game"  -- when used as animals to be hunted
 Notice that only the second is qualified; the first is processed in
 the normal gettext() manner (as at most one ambiguous string can be).
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32911 - /branches/S2_6/utility/fcintl.c

[cazfi74]

Author: cazfi
Date: Sun Jun 19 05:04:26 2016
New Revision: 32911

URL: http://svn.gna.org/viewcvs/freeciv?rev=32911&view=rev
Log:
Comment typofix: "animales" -> "animals"

Modified:
branches/S2_6/utility/fcintl.c

Modified: branches/S2_6/utility/fcintl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/fcintl.c?rev=32911&r1=32910&r2=32911&view=diff
==
--- branches/S2_6/utility/fcintl.c  (original)
+++ branches/S2_6/utility/fcintl.c  Sun Jun 19 05:04:26 2016
@@ -30,7 +30,7 @@
 To distinguish strings for translation, we qualify them with a prefix
 string of the form "?qualifier:".  So, the above two cases might be:
   "Game"   -- when used as meaning something you play
-  "?animals:Game"  -- when used as animales to be hunted
+  "?animals:Game"  -- when used as animals to be hunted
 Notice that only the second is qualified; the first is processed in
 the normal gettext() manner (as at most one ambiguous string can be).
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32910 - /trunk/utility/fcintl.c

[cazfi74]

Author: cazfi
Date: Sun Jun 19 05:04:06 2016
New Revision: 32910

URL: http://svn.gna.org/viewcvs/freeciv?rev=32910&view=rev
Log:
Comment typofix: "animales" -> "animals"

Modified:
trunk/utility/fcintl.c

Modified: trunk/utility/fcintl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/fcintl.c?rev=32910&r1=32909&r2=32910&view=diff
==
--- trunk/utility/fcintl.c  (original)
+++ trunk/utility/fcintl.c  Sun Jun 19 05:04:06 2016
@@ -30,7 +30,7 @@
 To distinguish strings for translation, we qualify them with a prefix
 string of the form "?qualifier:".  So, the above two cases might be:
   "Game"   -- when used as meaning something you play
-  "?animals:Game"  -- when used as animales to be hunted
+  "?animals:Game"  -- when used as animals to be hunted
 Notice that only the second is qualified; the first is processed in
 the normal gettext() manner (as at most one ambiguous string can be).
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32909 - /trunk/translations/core/fi.po

[cazfi74]

Author: cazfi
Date: Sun Jun 19 03:55:23 2016
New Revision: 32909

URL: http://svn.gna.org/viewcvs/freeciv?rev=32909&view=rev
Log:
Updated Finnish translation. This is just S2_6 translation msgmerged against 
latest TRUNK strings.

Modified:
trunk/translations/core/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/translations/core/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/fi.po?rev=32909&r1=32908&r2=32909&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32908 - /branches/S2_6/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Sun Jun 19 03:50:14 2016
New Revision: 32908

URL: http://svn.gna.org/viewcvs/freeciv?rev=32908&view=rev
Log:
Updated Finnish translation.

Modified:
branches/S2_6/translations/freeciv/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fi.po?rev=32908&r1=32907&r2=32908&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32907 - /branches/S2_5/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Sun Jun 19 03:47:10 2016
New Revision: 32907

URL: http://svn.gna.org/viewcvs/freeciv?rev=32907&view=rev
Log:
Updated Finnish translation.

Modified:
branches/S2_5/translations/freeciv/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fi.po?rev=32907&r1=32906&r2=32907&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32906 - in /branches/S2_6/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/ sandbox/ stub/

[cazfi74]

Author: cazfi
Date: Sun Jun 19 01:22:14 2016
New Revision: 32906

URL: http://svn.gna.org/viewcvs/freeciv?rev=32906&view=rev
Log:
Replaced typo 'froḿ' with 'from' in comment in game.rulesets.

See patch #7272

Modified:
branches/S2_6/data/alien/game.ruleset
branches/S2_6/data/civ1/game.ruleset
branches/S2_6/data/civ2/game.ruleset
branches/S2_6/data/civ2civ3/game.ruleset
branches/S2_6/data/classic/game.ruleset
branches/S2_6/data/experimental/game.ruleset
branches/S2_6/data/multiplayer/game.ruleset
branches/S2_6/data/sandbox/game.ruleset
branches/S2_6/data/stub/game.ruleset

Modified: branches/S2_6/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/alien/game.ruleset   (original)
+++ branches/S2_6/data/alien/game.ruleset   Sun Jun 19 01:22:14 2016
@@ -427,7 +427,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/civ1/game.ruleset(original)
+++ branches/S2_6/data/civ1/game.rulesetSun Jun 19 01:22:14 2016
@@ -413,7 +413,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/civ2/game.ruleset(original)
+++ branches/S2_6/data/civ2/game.rulesetSun Jun 19 01:22:14 2016
@@ -477,7 +477,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/civ2civ3/game.ruleset(original)
+++ branches/S2_6/data/civ2civ3/game.rulesetSun Jun 19 01:22:14 2016
@@ -505,7 +505,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/classic/game.ruleset (original)
+++ branches/S2_6/data/classic/game.ruleset Sun Jun 19 01:22:14 2016
@@ -502,7 +502,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/experimental/game.ruleset(original)
+++ branches/S2_6/data/experimental/game.rulesetSun Jun 19 01:22:14 2016
@@ -518,7 +518,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: branches/S2_6/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=32906&r1=32905&r2=32906&view=diff
==
--- branches/S2_6/data/multiplayer/game.ruleset (original)
+++ branches/S2_6/data/multiplayer/game.ruleset Sun Jun 19 01:22:14 2016
@@ -486,7 +486,7 @@
 fragments = 0
 
 ; Calenda

[Freeciv-commits] r32905 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/ sandbox/ stub/

[cazfi74]

Author: cazfi
Date: Sun Jun 19 01:22:04 2016
New Revision: 32905

URL: http://svn.gna.org/viewcvs/freeciv?rev=32905&view=rev
Log:
Replaced typo 'froḿ' with 'from' in comment in game.rulesets.

See patch #7272

Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
trunk/data/sandbox/game.ruleset
trunk/data/stub/game.ruleset

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/alien/game.ruleset   (original)
+++ trunk/data/alien/game.ruleset   Sun Jun 19 01:22:04 2016
@@ -621,7 +621,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/civ1/game.ruleset(original)
+++ trunk/data/civ1/game.rulesetSun Jun 19 01:22:04 2016
@@ -565,7 +565,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/civ2/game.ruleset(original)
+++ trunk/data/civ2/game.rulesetSun Jun 19 01:22:04 2016
@@ -665,7 +665,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/civ2civ3/game.ruleset(original)
+++ trunk/data/civ2civ3/game.rulesetSun Jun 19 01:22:04 2016
@@ -711,7 +711,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Sun Jun 19 01:22:04 2016
@@ -675,7 +675,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/experimental/game.ruleset(original)
+++ trunk/data/experimental/game.rulesetSun Jun 19 01:22:04 2016
@@ -691,7 +691,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=32905&r1=32904&r2=32905&view=diff
==
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Sun Jun 19 01:22:04 2016
@@ -658,7 +658,7 @@
 fragments = 0
 
 ; Calendar fragment names. If name is missing, only a fragment number +1 (so 
human readable
-; numbers begin froḿ 1 and not 0) is shown.
+; numbers begin from 1 and not 0) is shown.
 
 ;fragment_name0 = "Jan"
 ;fragment_name1 = "Feb"

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/

[Freeciv-commits] r32904 - in /trunk/common: Makefile.am generate_packets.py networking/Makefile.am networking/packets.def packets.def

[cazfi74]

Author: cazfi
Date: Sat Jun 18 18:21:24 2016
New Revision: 32904

URL: http://svn.gna.org/viewcvs/freeciv?rev=32904&view=rev
Log:
Moved packets.def to common/networking/

See patch #7273

Added:
trunk/common/networking/packets.def
  - copied unchanged from r32903, trunk/common/packets.def
Removed:
trunk/common/packets.def
Modified:
trunk/common/Makefile.am
trunk/common/generate_packets.py
trunk/common/networking/Makefile.am

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/common/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/Makefile.am?rev=32904&r1=32903&r2=32904&view=diff

Modified: trunk/common/generate_packets.py
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/generate_packets.py?rev=32904&r1=32903&r2=32904&view=diff

Modified: trunk/common/networking/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/Makefile.am?rev=32904&r1=32903&r2=32904&view=diff

Removed: trunk/common/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=32903&view=auto


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32902 - in /trunk/data: alien/game.ruleset classic/game.ruleset experimental/game.ruleset

[cazfi74]

Author: cazfi
Date: Sat Jun 18 12:11:05 2016
New Revision: 32902

URL: http://svn.gna.org/viewcvs/freeciv?rev=32902&view=rev
Log:
Renamed "Enter Marketplace" action as "Sell Goods" in
classic and experimental rulesets and as "Monetize Containers" in
alien ruleset.

This is to ease confusion about action's relation to Marketplace
building reported by Frank 

See bug #24463

Modified:
trunk/data/alien/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=32902&r1=32901&r2=32902&view=diff
==
--- trunk/data/alien/game.ruleset   (original)
+++ trunk/data/alien/game.ruleset   Sat Jun 18 12:11:05 2016
@@ -240,8 +240,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Monetize Containers (100% chance of success). */
+ui_name_enter_marketplace = _("Monetize %sContainers%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=32902&r1=32901&r2=32902&view=diff
==
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Sat Jun 18 12:11:05 2016
@@ -248,8 +248,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Sell _Goods (100% chance of success). */
+ui_name_enter_marketplace = _("Sell %sGoods%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=32902&r1=32901&r2=32902&view=diff
==
--- trunk/data/experimental/game.ruleset(original)
+++ trunk/data/experimental/game.rulesetSat Jun 18 12:11:05 2016
@@ -251,8 +251,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Sell _Goods (100% chance of success). */
+ui_name_enter_marketplace = _("Sell %sGoods%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32903 - in /branches/S2_6/data: alien/game.ruleset classic/game.ruleset experimental/game.ruleset

[cazfi74]

Author: cazfi
Date: Sat Jun 18 12:11:10 2016
New Revision: 32903

URL: http://svn.gna.org/viewcvs/freeciv?rev=32903&view=rev
Log:
Renamed "Enter Marketplace" action as "Sell Goods" in
classic and experimental rulesets and as "Monetize Containers" in
alien ruleset.

This is to ease confusion about action's relation to Marketplace
building reported by Frank 

See bug #24463

Modified:
branches/S2_6/data/alien/game.ruleset
branches/S2_6/data/classic/game.ruleset
branches/S2_6/data/experimental/game.ruleset

Modified: branches/S2_6/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=32903&r1=32902&r2=32903&view=diff
==
--- branches/S2_6/data/alien/game.ruleset   (original)
+++ branches/S2_6/data/alien/game.ruleset   Sat Jun 18 12:11:10 2016
@@ -220,8 +220,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Monetize Containers (100% chance of success). */
+ui_name_enter_marketplace = _("Monetize %sContainers%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")

Modified: branches/S2_6/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=32903&r1=32902&r2=32903&view=diff
==
--- branches/S2_6/data/classic/game.ruleset (original)
+++ branches/S2_6/data/classic/game.ruleset Sat Jun 18 12:11:10 2016
@@ -227,8 +227,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Sell _Goods (100% chance of success). */
+ui_name_enter_marketplace = _("Sell %sGoods%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")

Modified: branches/S2_6/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=32903&r1=32902&r2=32903&view=diff
==
--- branches/S2_6/data/experimental/game.ruleset(original)
+++ branches/S2_6/data/experimental/game.rulesetSat Jun 18 12:11:10 2016
@@ -231,8 +231,8 @@
 ; /* TRANS: Establish Trade _Route (100% chance of success). */
 ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
 
-; /* TRANS: Enter _Marketplace (100% chance of success). */
-ui_name_enter_marketplace = _("Enter %sMarketplace%s")
+; /* TRANS: Sell _Goods (100% chance of success). */
+ui_name_enter_marketplace = _("Sell %sGoods%s")
 
 ; /* TRANS: Help _build Wonder (100% chance of success). */
 ui_name_help_wonder = _("Help %sbuild Wonder%s")


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32901 - /branches/S2_6/common/dataio.c

[cazfi74]

Author: cazfi
Date: Sat Jun 18 11:45:44 2016
New Revision: 32901

URL: http://svn.gna.org/viewcvs/freeciv?rev=32901&view=rev
Log:
Log cleartext field range assert failure reason also when asserts enabled

See patch #7270

Modified:
branches/S2_6/common/dataio.c

Modified: branches/S2_6/common/dataio.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/dataio.c?rev=32901&r1=32900&r2=32901&view=diff
==
--- branches/S2_6/common/dataio.c   (original)
+++ branches/S2_6/common/dataio.c   Sat Jun 18 11:45:44 2016
@@ -82,14 +82,15 @@
   fc_assert(!(_test_));   \
   if (_test_) {   \
 _action_  \
-  }
-#else
+log_error(_format_, ## __VA_ARGS__);  \
+  }
+#else  /* FIELD_RANGE_ASSERT */
 #define FIELD_RANGE_TEST(_test_, _action_, _format_, ...) \
   if (_test_) {   \
 _action_  \
 log_error(_format_, ## __VA_ARGS__);  \
   }
-#endif
+#endif /* FIELD_RANGE_ASSERT */
 
 /**
   Sets string conversion callback to be used when putting text.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32900 - /trunk/common/networking/dataio_raw.c

[cazfi74]

Author: cazfi
Date: Sat Jun 18 11:45:40 2016
New Revision: 32900

URL: http://svn.gna.org/viewcvs/freeciv?rev=32900&view=rev
Log:
Log cleartext field range assert failure reason also when asserts enabled

See patch #7270

Modified:
trunk/common/networking/dataio_raw.c

Modified: trunk/common/networking/dataio_raw.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/dataio_raw.c?rev=32900&r1=32899&r2=32900&view=diff
==
--- trunk/common/networking/dataio_raw.c(original)
+++ trunk/common/networking/dataio_raw.cSat Jun 18 11:45:40 2016
@@ -82,14 +82,15 @@
   fc_assert(!(_test_));   \
   if (_test_) {   \
 _action_  \
-  }
-#else
+log_error(_format_, ## __VA_ARGS__);  \
+  }
+#else  /* FIELD_RANGE_ASSERT */
 #define FIELD_RANGE_TEST(_test_, _action_, _format_, ...) \
   if (_test_) {   \
 _action_  \
 log_error(_format_, ## __VA_ARGS__);  \
   }
-#endif
+#endif /* FIELD_RANGE_ASSERT */
 
 /**
   Sets string conversion callback to be used when putting text.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32899 - /trunk/client/options.c

[cazfi74]

Author: cazfi
Date: Sat Jun 18 11:35:09 2016
New Revision: 32899

URL: http://svn.gna.org/viewcvs/freeciv?rev=32899&view=rev
Log:
Try to load freeciv-2.7 generated client options file if no freeciv-3.0
generated one exist.
It's not yet certain that there will ever be freeciv-2.7, but this change'
prepares TRUNK for the possibility.

See patch #7268

Modified:
trunk/client/options.c

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=32899&r1=32898&r2=32899&view=diff
==
--- trunk/client/options.c  (original)
+++ trunk/client/options.c  Sat Jun 18 11:35:09 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -5140,7 +5140,7 @@
   static int last_minors[] = {
 0,  /* There was no 0.x releases */
 14, /* 1.14 */
-6   /* 2.6 */
+7   /* 2.7 */
   };
 
 #if MINOR_VERSION >= 90


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32897 - /trunk/data/civ2civ3/units.ruleset

[cazfi74]

Author: cazfi
Date: Sat Jun 18 09:24:05 2016
New Revision: 32897

URL: http://svn.gna.org/viewcvs/freeciv?rev=32897&view=rev
Log:
Removed KillCitizen flag from civ2civ3 ruleset unitclass Sea.

Patch by David Fernandez 

See bug #24616

Modified:
trunk/data/civ2civ3/units.ruleset

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=32897&r1=32896&r2=32897&view=diff
==
--- trunk/data/civ2civ3/units.ruleset   (original)
+++ trunk/data/civ2civ3/units.ruleset   Sat Jun 18 09:24:05 2016
@@ -186,8 +186,7 @@
 name  = _("?unitclass:Sea")
 min_speed = 2
 hp_loss_pct   = 0
-flags = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative",
-"KillCitizen"
+flags = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative"
 
 [unitclass_trireme]
 ; /* TRANS: Unit class: used adjectivally */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32898 - /branches/S2_6/data/civ2civ3/units.ruleset

[cazfi74]

Author: cazfi
Date: Sat Jun 18 09:24:10 2016
New Revision: 32898

URL: http://svn.gna.org/viewcvs/freeciv?rev=32898&view=rev
Log:
Removed KillCitizen flag from civ2civ3 ruleset unitclass Sea.

Patch by David Fernandez 

See bug #24616

Modified:
branches/S2_6/data/civ2civ3/units.ruleset

Modified: branches/S2_6/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/units.ruleset?rev=32898&r1=32897&r2=32898&view=diff
==
--- branches/S2_6/data/civ2civ3/units.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/units.ruleset   Sat Jun 18 09:24:10 2016
@@ -167,8 +167,7 @@
 name  = _("?unitclass:Sea")
 min_speed = 2
 hp_loss_pct   = 0
-flags = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative",
-"KillCitizen"
+flags = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative"
 
 [unitclass_trireme]
 ; /* TRANS: Unit class: used adjectivally */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32896 - in /branches/S2_6/win32: ./ installer/ installer_msys2/

[cazfi74]

Author: cazfi
Date: Sat Jun 18 09:16:39 2016
New Revision: 32896

URL: http://svn.gna.org/viewcvs/freeciv?rev=32896&view=rev
Log:
Windows Installer build makes 'svn revert' on translation/ between
each package to build when making 'snapshot' builds.

See bug #24449

Added:
branches/S2_6/win32/installer/cleanup_checkout.sh   (with props)
branches/S2_6/win32/installer_msys2/cleanup_checkout.sh   (with props)
Modified:
branches/S2_6/win32/Makefile.am
branches/S2_6/win32/installer/Makefile
branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/Makefile.am?rev=32896&r1=32895&r2=32896&view=diff
==
--- branches/S2_6/win32/Makefile.am (original)
+++ branches/S2_6/win32/Makefile.am Sat Jun 18 09:16:39 2016
@@ -27,6 +27,7 @@
installer/freeciv-ruledit.cmd   \
installer/Freeciv.url   \
installer/Makefile  \
+   installer/cleanup_checkout.sh   \
installer_msys2/licenses/COPYING.installer  \
installer_msys2/create-freeciv-gtk-qt-nsi.sh\
installer_msys2/create-freeciv-gtk2-nsi.sh  \
@@ -45,6 +46,7 @@
installer_msys2/freeciv-ruledit.cmd \
installer_msys2/Freeciv.url \
installer_msys2/Makefile\
+   installer_msys2/cleanup_checkout.sh \
installer_msys2/win_arch.sh
 
 if MINGW

Modified: branches/S2_6/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/Makefile?rev=32896&r1=32895&r2=32896&view=diff
==
--- branches/S2_6/win32/installer/Makefile  (original)
+++ branches/S2_6/win32/installer/Makefile  Sat Jun 18 09:16:39 2016
@@ -342,9 +342,11 @@
 
 clean-install-common:
rm -rf install-$(GUI)
+   ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
rm -rf install-ruledit
+   ./cleanup_checkout.sh ../..
 
 clean-installer-common:
rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: branches/S2_6/win32/installer/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/cleanup_checkout.sh?rev=32896&view=auto
==
--- branches/S2_6/win32/installer/cleanup_checkout.sh   (added)
+++ branches/S2_6/win32/installer/cleanup_checkout.sh   Sat Jun 18 09:16:39 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+cd $1/translations
+svn revert -R .
+fi

Propchange: branches/S2_6/win32/installer/cleanup_checkout.sh
--
svn:executable = *

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=32896&r1=32895&r2=32896&view=diff
==
--- branches/S2_6/win32/installer_msys2/Makefile(original)
+++ branches/S2_6/win32/installer_msys2/MakefileSat Jun 18 09:16:39 2016
@@ -392,9 +392,11 @@
 
 clean-install-common:
rm -rf install-*-$(GUI)
+   ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
rm -rf install-*-ruledit
+   ./cleanup_checkout.sh ../..
 
 clean-installer-common:
rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: branches/S2_6/win32/installer_msys2/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/cleanup_checkout.sh?rev=32896&view=auto
==
--- branches/S2_6/win32/installer_msys2/cleanup_checkout.sh (added)
+++ branches/S2_6/win32/installer_msys2/cleanup_checkout.sh Sat Jun 18 
09:16:39 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+cd $1/translations
+svn revert -R .
+fi

Propchange: branches/S2_6/win32/installer_msys2/cleanup_checkout.sh
--
svn:executable = *


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32895 - in /trunk/win32: ./ installer/ installer_msys2/

[cazfi74]

Author: cazfi
Date: Sat Jun 18 09:16:15 2016
New Revision: 32895

URL: http://svn.gna.org/viewcvs/freeciv?rev=32895&view=rev
Log:
Windows Installer build makes 'svn revert' on translation/ between
each package to build when making 'snapshot' builds.

See bug #24449

Added:
trunk/win32/installer/cleanup_checkout.sh   (with props)
trunk/win32/installer_msys2/cleanup_checkout.sh   (with props)
Modified:
trunk/win32/Makefile.am
trunk/win32/installer/Makefile
trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/Makefile.am?rev=32895&r1=32894&r2=32895&view=diff
==
--- trunk/win32/Makefile.am (original)
+++ trunk/win32/Makefile.am Sat Jun 18 09:16:15 2016
@@ -25,6 +25,7 @@
installer/freeciv-ruledit.cmd   \
installer/Freeciv.url   \
installer/Makefile  \
+   installer/cleanup_checkout.sh   \
installer_msys2/licenses/COPYING.installer  \
installer_msys2/create-freeciv-gtk-qt-nsi.sh\
installer_msys2/create-freeciv-gtk2-nsi.sh  \
@@ -46,6 +47,7 @@
installer_msys2/freeciv-ruledit.cmd \
installer_msys2/Freeciv.url \
installer_msys2/Makefile\
+   installer_msys2/cleanup_checkout.sh \
installer_msys2/win_arch.sh
 
 if MINGW

Modified: trunk/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=32895&r1=32894&r2=32895&view=diff
==
--- trunk/win32/installer/Makefile  (original)
+++ trunk/win32/installer/Makefile  Sat Jun 18 09:16:15 2016
@@ -304,9 +304,11 @@
 
 clean-install-common:
rm -rf install-$(GUI)
+   ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
rm -rf install-ruledit
+   ./cleanup_checkout.sh ../..
 
 clean-installer-common:
rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: trunk/win32/installer/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/cleanup_checkout.sh?rev=32895&view=auto
==
--- trunk/win32/installer/cleanup_checkout.sh   (added)
+++ trunk/win32/installer/cleanup_checkout.sh   Sat Jun 18 09:16:15 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+cd $1/translations
+svn revert -R .
+fi

Propchange: trunk/win32/installer/cleanup_checkout.sh
--
svn:executable = *

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32895&r1=32894&r2=32895&view=diff
==
--- trunk/win32/installer_msys2/Makefile(original)
+++ trunk/win32/installer_msys2/MakefileSat Jun 18 09:16:15 2016
@@ -408,9 +408,11 @@
 
 clean-install-common:
rm -rf install-*-$(GUI)
+   ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
rm -rf install-*-ruledit
+   ./cleanup_checkout.sh ../..
 
 clean-installer-common:
rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: trunk/win32/installer_msys2/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/cleanup_checkout.sh?rev=32895&view=auto
==
--- trunk/win32/installer_msys2/cleanup_checkout.sh (added)
+++ trunk/win32/installer_msys2/cleanup_checkout.sh Sat Jun 18 09:16:15 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+cd $1/translations
+svn revert -R .
+fi

Propchange: trunk/win32/installer_msys2/cleanup_checkout.sh
--
svn:executable = *


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32893 - in /trunk: ./ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.x/ common/ server/ server/generator/

[cazfi74]

Author: cazfi
Date: Sat Jun 18 08:07:18 2016
New Revision: 32893

URL: http://svn.gna.org/viewcvs/freeciv?rev=32893&view=rev
Log:
Made 'have_resources' scenario property editor controlled.

Requested by Jacob Nevins 

See bug #21347

Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.x/editprop.c
trunk/client/packhand.c
trunk/common/game.c
trunk/common/map.c
trunk/common/map_types.h
trunk/common/packets.def
trunk/fc_version
trunk/server/edithand.c
trunk/server/generator/mapgen.c
trunk/server/legacysave.c
trunk/server/savegame2.c
trunk/server/savegame3.c
trunk/server/srv_main.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=32893&r1=32892&r2=32893&view=diff
==
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Sat Jun 18 08:07:18 2016
@@ -356,9 +356,9 @@
   OPID_PLAYER_NATION,
   OPID_PLAYER_GOV,
   OPID_PLAYER_AGE,
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
   OPID_PLAYER_ADDRESS,
-#endif /* DEBUG */
+#endif /* FREECIV_DEBUG */
   OPID_PLAYER_INVENTIONS,
   OPID_PLAYER_SCIENCE,
   OPID_PLAYER_GOLD,
@@ -373,6 +373,7 @@
   OPID_GAME_STARTPOS_NATIONS,
   OPID_GAME_PREVENT_CITIES,
   OPID_GAME_LAKE_FLOODING,
+  OPID_GAME_HAVE_RESOURCES,
   OPID_GAME_RULESET_LOCKED
 };
 
@@ -1841,6 +1842,9 @@
   case OPID_GAME_LAKE_FLOODING:
 pv->data.v_bool = pgame->scenario.lake_flooding;
 break;
+  case OPID_GAME_HAVE_RESOURCES:
+pv->data.v_bool = pgame->scenario.have_resources;
+break;
   case OPID_GAME_RULESET_LOCKED:
 pv->data.v_bool = pgame->scenario.ruleset_locked;
 break;
@@ -2346,6 +2350,7 @@
   packet->startpos_nations = pgame->scenario.startpos_nations;
   packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
   packet->lake_flooding = pgame->scenario.lake_flooding;
+  packet->have_resources = pgame->scenario.have_resources;
 }
 return;
 
@@ -2599,6 +2604,9 @@
   case OPID_GAME_LAKE_FLOODING:
 packet->lake_flooding = pv->data.v_bool;
 return;
+  case OPID_GAME_HAVE_RESOURCES:
+packet->have_resources = pv->data.v_bool;
+return;
   case OPID_GAME_RULESET_LOCKED:
 packet->ruleset_locked = pv->data.v_bool;
 return;
@@ -3047,6 +3055,7 @@
   case OPID_GAME_STARTPOS_NATIONS:
   case OPID_GAME_PREVENT_CITIES:
   case OPID_GAME_LAKE_FLOODING:
+  case OPID_GAME_HAVE_RESOURCES:
   case OPID_GAME_RULESET_LOCKED:
 button = gtk_check_button_new();
 g_signal_connect(button, "toggled",
@@ -3262,6 +3271,7 @@
   case OPID_GAME_STARTPOS_NATIONS:
   case OPID_GAME_PREVENT_CITIES:
   case OPID_GAME_LAKE_FLOODING:
+  case OPID_GAME_HAVE_RESOURCES:
   case OPID_GAME_RULESET_LOCKED:
 button = objprop_get_child_widget(op, "checkbutton");
 disable_gobject_callback(G_OBJECT(button),
@@ -4493,6 +4503,8 @@
 OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
 ADDPROP(OPID_GAME_LAKE_FLOODING, _("Saltwater Flooding Lakes"),
 OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
+ADDPROP(OPID_GAME_HAVE_RESOURCES, _("Do not regenerate resources"),
+OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
 ADDPROP(OPID_GAME_RULESET_LOCKED, _("Lock to current Ruleset"),
 OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
 return;

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=32893&r1=32892&r2=32893&view=diff
==
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Sat Jun 18 08:07:18 2016
@@ -357,9 +357,9 @@
   OPID_PLAYER_NATION,
   OPID_PLAYER_GOV,
   OPID_PLAYER_AGE,
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
   OPID_PLAYER_ADDRESS,
-#endif /* DEBUG */
+#endif /* FREECIV_DEBUG */
   OPID_PLAYER_INVENTIONS,
   OPID_PLAYER_SCIENCE,
   OPID_PLAYER_GOLD,
@@ -374,6 +374,7 @@
   OPID_GAME_STARTPOS_NATIONS,
   OPID_GAME_PREVENT_CITIES,
   OPID_GAME_LAKE_FLOODING,
+  OPID_GAME_HAVE_RESOURCES,
   OPID_GAME_RULESET_LOCKED
 };
 
@@ -1842,6 +1843,9 @@
   case OPID_GAME_LAKE_FLOODING:
 pv->data.v_bool = pgame->scenario.lake_flooding;
 break;
+  case OPID_GAME_HAVE_RESOURCES:
+pv->data.v_bool = pgame->scenario.have_resources;
+break;
   case OPID_GAME_RULESET_LOCKED:
 pv->data.v_bool = pgame->scenario.ruleset_locked;
 break;
@@ -2347,6 +2351,7 @@
   packet->startpos_nations = pgame->scenario.startpos_nations;
   packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
   packet->lake_flooding = pgame->scenario.lake_flooding;
+  

[Freeciv-commits] r32894 - in /branches/S2_6: ./ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ common/ server/ server/generator/

[cazfi74]

Author: cazfi
Date: Sat Jun 18 08:07:45 2016
New Revision: 32894

URL: http://svn.gna.org/viewcvs/freeciv?rev=32894&view=rev
Log:
Made 'have_resources' scenario property editor controlled.

Requested by Jacob Nevins 

See bug #21347

Modified:
branches/S2_6/client/gui-gtk-2.0/editprop.c
branches/S2_6/client/gui-gtk-3.0/editprop.c
branches/S2_6/client/packhand.c
branches/S2_6/common/game.c
branches/S2_6/common/map.c
branches/S2_6/common/map_types.h
branches/S2_6/common/packets.def
branches/S2_6/fc_version
branches/S2_6/server/edithand.c
branches/S2_6/server/generator/mapgen.c
branches/S2_6/server/savegame.c
branches/S2_6/server/savegame2.c
branches/S2_6/server/srv_main.c

Modified: branches/S2_6/client/gui-gtk-2.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/editprop.c?rev=32894&r1=32893&r2=32894&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/editprop.c Sat Jun 18 08:07:45 2016
@@ -356,9 +356,9 @@
   OPID_PLAYER_NATION,
   OPID_PLAYER_GOV,
   OPID_PLAYER_AGE,
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
   OPID_PLAYER_ADDRESS,
-#endif /* DEBUG */
+#endif /* FREECIV_DEBUG */
   OPID_PLAYER_INVENTIONS,
   OPID_PLAYER_SCIENCE,
   OPID_PLAYER_GOLD,
@@ -372,7 +372,8 @@
   OPID_GAME_SCENARIO_PLAYERS,
   OPID_GAME_STARTPOS_NATIONS,
   OPID_GAME_PREVENT_CITIES,
-  OPID_GAME_LAKE_FLOODING
+  OPID_GAME_LAKE_FLOODING,
+  OPID_GAME_HAVE_RESOURCES
 };
 
 enum object_property_flags {
@@ -1840,6 +1841,9 @@
   case OPID_GAME_LAKE_FLOODING:
 pv->data.v_bool = pgame->scenario.lake_flooding;
 break;
+  case OPID_GAME_HAVE_RESOURCES:
+pv->data.v_bool = pgame->scenario.have_resources;
+break;
   default:
 log_error("%s(): Unhandled request for value of property %d "
   "(%s) from object of type \"%s\".", __FUNCTION__,
@@ -2342,6 +2346,7 @@
   packet->startpos_nations = pgame->scenario.startpos_nations;
   packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
   packet->lake_flooding = pgame->scenario.lake_flooding;
+  packet->have_resources = pgame->scenario.have_resources;
 }
 return;
 
@@ -2595,6 +2600,9 @@
   case OPID_GAME_LAKE_FLOODING:
 packet->lake_flooding = pv->data.v_bool;
 return;
+  case OPID_GAME_HAVE_RESOURCES:
+packet->have_resources = pv->data.v_bool;
+return;
   default:
 break;
   }
@@ -3040,6 +3048,7 @@
   case OPID_GAME_STARTPOS_NATIONS:
   case OPID_GAME_PREVENT_CITIES:
   case OPID_GAME_LAKE_FLOODING:
+  case OPID_GAME_HAVE_RESOURCES:
 button = gtk_check_button_new();
 g_signal_connect(button, "toggled",
 G_CALLBACK(objprop_widget_toggle_button_changed), op);
@@ -3254,6 +3263,7 @@
   case OPID_GAME_STARTPOS_NATIONS:
   case OPID_GAME_PREVENT_CITIES:
   case OPID_GAME_LAKE_FLOODING:
+  case OPID_GAME_HAVE_RESOURCES:
 button = objprop_get_child_widget(op, "checkbutton");
 disable_gobject_callback(G_OBJECT(button),
 G_CALLBACK(objprop_widget_toggle_button_changed));
@@ -4484,6 +4494,8 @@
 OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
 ADDPROP(OPID_GAME_LAKE_FLOODING, _("Saltwater Flooding Lakes"),
 OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
+ADDPROP(OPID_GAME_HAVE_RESOURCES, _("Do not regenerate resources"),
+OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL);
 return;
 
   case NUM_OBJTYPES:

Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=32894&r1=32893&r2=32894&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Sat Jun 18 08:07:45 2016
@@ -357,9 +357,9 @@
   OPID_PLAYER_NATION,
   OPID_PLAYER_GOV,
   OPID_PLAYER_AGE,
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
   OPID_PLAYER_ADDRESS,
-#endif /* DEBUG */
+#endif /* FREECIV_DEBUG */
   OPID_PLAYER_INVENTIONS,
   OPID_PLAYER_SCIENCE,
   OPID_PLAYER_GOLD,
@@ -373,7 +373,8 @@
   OPID_GAME_SCENARIO_PLAYERS,
   OPID_GAME_STARTPOS_NATIONS,
   OPID_GAME_PREVENT_CITIES,
-  OPID_GAME_LAKE_FLOODING
+  OPID_GAME_LAKE_FLOODING,
+  OPID_GAME_HAVE_RESOURCES
 };
 
 enum object_property_flags {
@@ -1841,6 +1842,9 @@
   case OPID_GAME_LAKE_FLOODING:
 pv->data.v_bool = pgame->scenario.lake_flooding;
 break;
+  case OPID_GAME_HAVE_RESOURCES:
+pv->data.v_bool = pgame->scenario.have_resources;
+break;
   default:
 log_error("%s(): Unhandled request for value of property %d "
   "(%s) from object of type \"%s\".", __FUNCTION__,
@@ -2343,6 +2347,7 @@
   packet->startpos_nations = p

[Freeciv-commits] r32891 - /trunk/data/scenarios/europe_1901.sav

[cazfi74]

Author: cazfi
Date: Fri Jun 17 20:22:48 2016
New Revision: 32891

URL: http://svn.gna.org/viewcvs/freeciv?rev=32891&view=rev
Log:
Updated europe_1901 scenario to freeciv-2.6 format.

See bug #24053

Modified:
trunk/data/scenarios/europe_1901.sav

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/data/scenarios/europe_1901.sav
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/europe_1901.sav?rev=32891&r1=32890&r2=32891&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32892 - /branches/S2_6/data/scenarios/europe_1901.sav

[cazfi74]

Author: cazfi
Date: Fri Jun 17 20:22:58 2016
New Revision: 32892

URL: http://svn.gna.org/viewcvs/freeciv?rev=32892&view=rev
Log:
Updated europe_1901 scenario to freeciv-2.6 format.

See bug #24053

Modified:
branches/S2_6/data/scenarios/europe_1901.sav

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/data/scenarios/europe_1901.sav
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/europe_1901.sav?rev=32892&r1=32891&r2=32892&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32890 - /branches/S2_5/server/citytools.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 18:18:17 2016
New Revision: 32890

URL: http://svn.gna.org/viewcvs/freeciv?rev=32890&view=rev
Log:
Do not penalize AI production changes, even when the change is one
from the worklist or advisor.

See bug #24760

Modified:
branches/S2_5/server/citytools.c

Modified: branches/S2_5/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/citytools.c?rev=32890&r1=32889&r2=32890&view=diff
==
--- branches/S2_5/server/citytools.c(original)
+++ branches/S2_5/server/citytools.cFri Jun 17 18:18:17 2016
@@ -2808,7 +2808,9 @@
 
   /* Manage the city change-production penalty.
  (May penalize, restore or do nothing to the shield_stock.) */
-  pcity->shield_stock = city_change_production_penalty(pcity, target);
+  if (!pplayer->ai_controlled || ai_handicap(pplayer, H_AWAY)) {
+pcity->shield_stock = city_change_production_penalty(pcity, target);
+  }
 
   /* Change build target. */
   pcity->production = target;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32888 - /trunk/server/citytools.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 18:18:07 2016
New Revision: 32888

URL: http://svn.gna.org/viewcvs/freeciv?rev=32888&view=rev
Log:
Do not penalize AI production changes, even when the change is one
from the worklist or advisor.

See bug #24760

Modified:
trunk/server/citytools.c

Modified: trunk/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=32888&r1=32887&r2=32888&view=diff
==
--- trunk/server/citytools.c(original)
+++ trunk/server/citytools.cFri Jun 17 18:18:07 2016
@@ -79,6 +79,9 @@
 
 /* server/scripting */
 #include "script_server.h"
+
+/* ai */
+#include "handicaps.h"
 
 #include "citytools.h"
 
@@ -2871,7 +2874,9 @@
 
   /* Manage the city change-production penalty.
  (May penalize, restore or do nothing to the shield_stock.) */
-  pcity->shield_stock = city_change_production_penalty(pcity, target);
+  if (!is_ai(pplayer) || has_handicap(pplayer, H_AWAY)) {
+pcity->shield_stock = city_change_production_penalty(pcity, target);
+  }
 
   /* Change build target. */
   pcity->production = *target;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32889 - /branches/S2_6/server/citytools.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 18:18:12 2016
New Revision: 32889

URL: http://svn.gna.org/viewcvs/freeciv?rev=32889&view=rev
Log:
Do not penalize AI production changes, even when the change is one
from the worklist or advisor.

See bug #24760

Modified:
branches/S2_6/server/citytools.c

Modified: branches/S2_6/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/citytools.c?rev=32889&r1=32888&r2=32889&view=diff
==
--- branches/S2_6/server/citytools.c(original)
+++ branches/S2_6/server/citytools.cFri Jun 17 18:18:12 2016
@@ -79,6 +79,9 @@
 
 /* server/scripting */
 #include "script_server.h"
+
+/* ai */
+#include "handicaps.h"
 
 #include "citytools.h"
 
@@ -2811,7 +2814,9 @@
 
   /* Manage the city change-production penalty.
  (May penalize, restore or do nothing to the shield_stock.) */
-  pcity->shield_stock = city_change_production_penalty(pcity, target);
+  if (!pplayer->ai_controlled || has_handicap(pplayer, H_AWAY)) {
+pcity->shield_stock = city_change_production_penalty(pcity, target);
+  }
 
   /* Change build target. */
   pcity->production = *target;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32885 - in /trunk/server: cityhand.c cityturn.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:43:14 2016
New Revision: 32885

URL: http://svn.gna.org/viewcvs/freeciv?rev=32885&view=rev
Log:
Improvements to translatable strings.

Patch by Konstantin Vedeneev  and myself

See patch #6908

Modified:
trunk/server/cityhand.c
trunk/server/cityturn.c

Modified: trunk/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityhand.c?rev=32885&r1=32884&r2=32885&view=diff
==
--- trunk/server/cityhand.c (original)
+++ trunk/server/cityhand.c Fri Jun 17 17:43:14 2016
@@ -369,13 +369,13 @@
   if (VUT_UTYPE == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_UNIT_BUY, ftc_server,
   /* TRANS: bought an unit. */
-  _("You bought %s in %s."),
+  Q_("?unit:You bought %s in %s."),
   utype_name_translation(pcity->production.value.utype),
   city_name_get(pcity));
   } else if (VUT_IMPROVEMENT == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_IMP_BUY, ftc_server,
   /* TRANS: bought an improvement .*/
-  _("You bought %s in %s."),
+  Q_("?improvement:You bought %s in %s."),
   
improvement_name_translation(pcity->production.value.building),
   city_name_get(pcity));
   }

Modified: trunk/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=32885&r1=32884&r2=32885&view=diff
==
--- trunk/server/cityturn.c (original)
+++ trunk/server/cityturn.c Fri Jun 17 17:43:14 2016
@@ -234,12 +234,17 @@
   city_built_iterate(pcity, pimprove) {
 if (improvement_obsolete(pplayer, pimprove, pcity)
  && can_city_sell_building(pcity, pimprove)) {
+  int sgold;
+
   do_sell_building(pplayer, pcity, pimprove);
+  sgold = impr_sell_gold(pimprove);
   notify_player(pplayer, city_tile(pcity), E_IMP_SOLD, ftc_server,
-_("%s is selling %s (obsolete) for %d."),
+PL_("%s is selling %s (obsolete) for %d.",
+"%s is selling %s (obsolete) for %d.",
+sgold),
 city_link(pcity),
-improvement_name_translation(pimprove), 
-impr_sell_gold(pimprove));
+improvement_name_translation(pimprove),
+sgold);
   sold = TRUE;
 }
   } city_built_iterate_end;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32887 - in /branches/S2_5: client/helpdata.c server/cityhand.c server/cityturn.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:43:24 2016
New Revision: 32887

URL: http://svn.gna.org/viewcvs/freeciv?rev=32887&view=rev
Log:
Improvements to translatable strings.

Patch by Konstantin Vedeneev  and myself

See patch #6908

Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/server/cityhand.c
branches/S2_5/server/cityturn.c

Modified: branches/S2_5/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=32887&r1=32886&r2=32887&view=diff
==
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Fri Jun 17 17:43:24 2016
@@ -2787,9 +2787,12 @@
   }
   if (utype_has_flag(utype, UTYF_PARATROOPERS)) {
 cat_snprintf(buf, bufsz,
-_("* Can be paradropped from a friendly city or suitable base"
-  " (range: %d tiles).\n"),
-utype->paratroopers_range);
+ PL_("* Can be paradropped from a friendly city or suitable "
+  "base (range: %d tile).\n",
+ "* Can be paradropped from a friendly city or suitable "
+  "base (range: %d tiles).\n",
+ utype->paratroopers_range),
+ utype->paratroopers_range);
   }
   if (!uclass_has_flag(utype_class(utype), UCF_MISSILE)
   && utype_has_flag(utype, UTYF_ONEATTACK)) {

Modified: branches/S2_5/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityhand.c?rev=32887&r1=32886&r2=32887&view=diff
==
--- branches/S2_5/server/cityhand.c (original)
+++ branches/S2_5/server/cityhand.c Fri Jun 17 17:43:24 2016
@@ -374,13 +374,13 @@
   if (VUT_UTYPE == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_UNIT_BUY, ftc_server,
   /* TRANS: bought an unit. */
-  _("You bought %s in %s."),
+  Q_("?unit:You bought %s in %s."),
   utype_name_translation(pcity->production.value.utype),
   city_name(pcity));
   } else if (VUT_IMPROVEMENT == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_IMP_BUY, ftc_server,
   /* TRANS: bought an improvement .*/
-  _("You bought %s in %s."),
+  Q_("?improvement:You bought %s in %s."),
   
improvement_name_translation(pcity->production.value.building),
   city_name(pcity));
   }

Modified: branches/S2_5/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=32887&r1=32886&r2=32887&view=diff
==
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Fri Jun 17 17:43:24 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -223,12 +223,17 @@
   city_built_iterate(pcity, pimprove) {
 if (improvement_obsolete(pplayer, pimprove)
  && can_city_sell_building(pcity, pimprove)) {
+  int sgold;
+
   do_sell_building(pplayer, pcity, pimprove);
+  sgold = impr_sell_gold(pimprove);
   notify_player(pplayer, city_tile(pcity), E_IMP_SOLD, ftc_server,
-_("%s is selling %s (obsolete) for %d."),
+PL_("%s is selling %s (obsolete) for %d.",
+"%s is selling %s (obsolete) for %d.",
+sgold),
 city_link(pcity),
-improvement_name_translation(pimprove), 
-impr_sell_gold(pimprove));
+improvement_name_translation(pimprove),
+sgold);
   sold = TRUE;
 }
   } city_built_iterate_end;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32886 - in /branches/S2_6: client/helpdata.c server/cityhand.c server/cityturn.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:43:19 2016
New Revision: 32886

URL: http://svn.gna.org/viewcvs/freeciv?rev=32886&view=rev
Log:
Improvements to translatable strings.

Patch by Konstantin Vedeneev  and myself

See patch #6908

Modified:
branches/S2_6/client/helpdata.c
branches/S2_6/server/cityhand.c
branches/S2_6/server/cityturn.c

Modified: branches/S2_6/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=32886&r1=32885&r2=32886&view=diff
==
--- branches/S2_6/client/helpdata.c (original)
+++ branches/S2_6/client/helpdata.c Fri Jun 17 17:43:19 2016
@@ -4193,9 +4193,12 @@
   }
   if (utype_has_flag(utype, UTYF_PARATROOPERS)) {
 cat_snprintf(buf, bufsz,
-_("* Can be paradropped from a friendly city or suitable base"
-  " (range: %d tiles).\n"),
-utype->paratroopers_range);
+ PL_("* Can be paradropped from a friendly city or suitable "
+  "base (range: %d tile).\n",
+ "* Can be paradropped from a friendly city or suitable "
+  "base (range: %d tiles).\n",
+ utype->paratroopers_range),
+ utype->paratroopers_range);
   }
   if (!uclass_has_flag(utype_class(utype), UCF_MISSILE)
   && utype_has_flag(utype, UTYF_ONEATTACK)) {

Modified: branches/S2_6/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityhand.c?rev=32886&r1=32885&r2=32886&view=diff
==
--- branches/S2_6/server/cityhand.c (original)
+++ branches/S2_6/server/cityhand.c Fri Jun 17 17:43:19 2016
@@ -374,13 +374,13 @@
   if (VUT_UTYPE == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_UNIT_BUY, ftc_server,
   /* TRANS: bought an unit. */
-  _("You bought %s in %s."),
+  Q_("?unit:You bought %s in %s."),
   utype_name_translation(pcity->production.value.utype),
   city_name_get(pcity));
   } else if (VUT_IMPROVEMENT == pcity->production.kind) {
 notify_player(pplayer, pcity->tile, E_IMP_BUY, ftc_server,
   /* TRANS: bought an improvement .*/
-  _("You bought %s in %s."),
+  Q_("?improvement:You bought %s in %s."),
   
improvement_name_translation(pcity->production.value.building),
   city_name_get(pcity));
   }

Modified: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=32886&r1=32885&r2=32886&view=diff
==
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Fri Jun 17 17:43:19 2016
@@ -228,12 +228,17 @@
   city_built_iterate(pcity, pimprove) {
 if (improvement_obsolete(pplayer, pimprove, pcity)
  && can_city_sell_building(pcity, pimprove)) {
+  int sgold;
+
   do_sell_building(pplayer, pcity, pimprove);
+  sgold = impr_sell_gold(pimprove);
   notify_player(pplayer, city_tile(pcity), E_IMP_SOLD, ftc_server,
-_("%s is selling %s (obsolete) for %d."),
+PL_("%s is selling %s (obsolete) for %d.",
+"%s is selling %s (obsolete) for %d.",
+sgold),
 city_link(pcity),
-improvement_name_translation(pimprove), 
-impr_sell_gold(pimprove));
+improvement_name_translation(pimprove),
+sgold);
   sold = TRUE;
 }
   } city_built_iterate_end;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32882 - /trunk/server/plrhand.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:39:08 2016
New Revision: 32882

URL: http://svn.gna.org/viewcvs/freeciv?rev=32882&view=rev
Log:
Replaced overzealous assert '!game_was_started()' with
'turn < 1' one, so it never fails during game startup.

See bug #24614

Modified:
trunk/server/plrhand.c

Modified: trunk/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=32882&r1=32881&r2=32882&view=diff
==
--- trunk/server/plrhand.c  (original)
+++ trunk/server/plrhand.c  Fri Jun 17 17:39:08 2016
@@ -1135,7 +1135,7 @@
   packet->color_green = preferred->g;
   packet->color_blue = preferred->b;
 } else {
-  fc_assert(!game_was_started());
+  fc_assert(game.info.turn < 1);
   packet->color_valid = FALSE;
   /* Client shouldn't use these dummy values */
   packet->color_red = 0;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32884 - /branches/S2_5/server/plrhand.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:39:21 2016
New Revision: 32884

URL: http://svn.gna.org/viewcvs/freeciv?rev=32884&view=rev
Log:
Replaced overzealous assert '!game_was_started()' with
'turn < 1' one, so it never fails during game startup.

See bug #24614

Modified:
branches/S2_5/server/plrhand.c

Modified: branches/S2_5/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/plrhand.c?rev=32884&r1=32883&r2=32884&view=diff
==
--- branches/S2_5/server/plrhand.c  (original)
+++ branches/S2_5/server/plrhand.c  Fri Jun 17 17:39:21 2016
@@ -1010,7 +1010,7 @@
   packet->color_green = preferred->g;
   packet->color_blue = preferred->b;
 } else {
-  fc_assert(!game_was_started());
+  fc_assert(game.info.turn < 1);
   /* Can't tell the client 'no color', so use dummy values (black). */
   packet->color_red = 0;
   packet->color_green = 0;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32883 - /branches/S2_6/server/plrhand.c

[cazfi74]

Author: cazfi
Date: Fri Jun 17 17:39:14 2016
New Revision: 32883

URL: http://svn.gna.org/viewcvs/freeciv?rev=32883&view=rev
Log:
Replaced overzealous assert '!game_was_started()' with
'turn < 1' one, so it never fails during game startup.

See bug #24614

Modified:
branches/S2_6/server/plrhand.c

Modified: branches/S2_6/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/plrhand.c?rev=32883&r1=32882&r2=32883&view=diff
==
--- branches/S2_6/server/plrhand.c  (original)
+++ branches/S2_6/server/plrhand.c  Fri Jun 17 17:39:14 2016
@@ -1135,7 +1135,7 @@
   packet->color_green = preferred->g;
   packet->color_blue = preferred->b;
 } else {
-  fc_assert(!game_was_started());
+  fc_assert(game.info.turn < 1);
   packet->color_valid = FALSE;
   /* Client shouldn't use these dummy values */
   packet->color_red = 0;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32875 - /branches/S2_5/server/settings.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 18:50:19 2016
New Revision: 32875

URL: http://svn.gna.org/viewcvs/freeciv?rev=32875&view=rev
Log:
Fixed typo 'invididual'.

See bug #24753

Modified:
branches/S2_5/server/settings.c

Modified: branches/S2_5/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=32875&r1=32874&r2=32875&view=diff
==
--- branches/S2_5/server/settings.c (original)
+++ branches/S2_5/server/settings.c Thu Jun 16 18:50:19 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996-2004 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1899,7 +1899,7 @@
   "individual players in order from a list defined by the "
   "ruleset.\n"
   "- \"Per-player, random\" (PLR_RANDOM): colors are assigned "
-  "to invididual players randomly from the set defined by the "
+  "to individual players randomly from the set defined by the "
   "ruleset.\n"
   "- \"Set manually\" (PLR_SET): colors can be set with the "
   "'playercolor' command before the game starts; these are not "


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32874 - /branches/S2_6/server/settings.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 18:50:10 2016
New Revision: 32874

URL: http://svn.gna.org/viewcvs/freeciv?rev=32874&view=rev
Log:
Fixed typo 'invididual'.

See bug #24753

Modified:
branches/S2_6/server/settings.c

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=32874&r1=32873&r2=32874&view=diff
==
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Thu Jun 16 18:50:10 2016
@@ -2111,7 +2111,7 @@
   "individual players in order from a list defined by the "
   "ruleset.\n"
   "- \"Per-player, random\" (PLR_RANDOM): colors are assigned "
-  "to invididual players randomly from the set defined by the "
+  "to individual players randomly from the set defined by the "
   "ruleset.\n"
   "- \"Set manually\" (PLR_SET): colors can be set with the "
   "'playercolor' command before the game starts; these are not "


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32873 - /trunk/server/settings.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 18:50:03 2016
New Revision: 32873

URL: http://svn.gna.org/viewcvs/freeciv?rev=32873&view=rev
Log:
Fixed typo 'invididual'.

See bug #24753

Modified:
trunk/server/settings.c

Modified: trunk/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=32873&r1=32872&r2=32873&view=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Thu Jun 16 18:50:03 2016
@@ -2158,7 +2158,7 @@
   "individual players in order from a list defined by the "
   "ruleset.\n"
   "- \"Per-player, random\" (PLR_RANDOM): colors are assigned "
-  "to invididual players randomly from the set defined by the "
+  "to individual players randomly from the set defined by the "
   "ruleset.\n"
   "- \"Set manually\" (PLR_SET): colors can be set with the "
   "'playercolor' command before the game starts; these are not "


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32872 - in /branches/S2_6: tools/download.c tools/mpcmdline.c utility/shared.c utility/shared.h

[cazfi74]

Author: cazfi
Date: Thu Jun 16 18:45:15 2016
New Revision: 32872

URL: http://svn.gna.org/viewcvs/freeciv?rev=32872&view=rev
Log:
Made modpack installer to respect dir separator definition.

See bug #24677

Modified:
branches/S2_6/tools/download.c
branches/S2_6/tools/mpcmdline.c
branches/S2_6/utility/shared.c
branches/S2_6/utility/shared.h

Modified: branches/S2_6/tools/download.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/download.c?rev=32872&r1=32871&r2=32872&view=diff
==
--- branches/S2_6/tools/download.c  (original)
+++ branches/S2_6/tools/download.c  Thu Jun 16 18:45:15 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "log.h"
+#include "mem.h"
 #include "netfile.h"
 #include "registry.h"
 
@@ -167,10 +168,10 @@
 
   if (type == MPT_SCENARIO) {
 fc_snprintf(local_dir, sizeof(local_dir),
-"%s/scenarios", fcmp->inst_prefix);
+"%s" DIR_SEPARATOR "scenarios", fcmp->inst_prefix);
   } else {
 fc_snprintf(local_dir, sizeof(local_dir),
-"%s/" DATASUBDIR, fcmp->inst_prefix);
+"%s" DIR_SEPARATOR DATASUBDIR, fcmp->inst_prefix);
   }
 
   baseURLpart = secfile_lookup_str(control, "info.baseURL");
@@ -273,6 +274,13 @@
   filenbr = 0;
   for (filenbr = 0; filenbr < total_files; filenbr++) {
 const char *dest_name;
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+char *dest_name_copy;
+#else  /* DIR_SEPARATOR_IS_DEFAULT */
+#define dest_name_copy dest_name
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+
 int i;
 bool illegal_filename = FALSE;
 
@@ -286,6 +294,10 @@
   /* Missing dest name is ok, we just default to src_name */
   dest_name = src_name;
 }
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+dest_name_copy = fc_malloc(strlen(dest_name) + 1);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 
 for (i = 0; dest_name[i] != '\0'; i++) {
   if (dest_name[i] == '.' && dest_name[i+1] == '.') {
@@ -299,12 +311,29 @@
 partial_failure = TRUE;
 illegal_filename = TRUE;
   }
-}
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  if (dest_name[i] == '/') {
+dest_name_copy[i] = DIR_SEPARATOR_CHAR;
+  } else {
+dest_name_copy[i] = dest_name[i];
+  }
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+}
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+dest_name_copy[i] = '\0';
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 
 if (!illegal_filename) {
   fc_snprintf(local_name, sizeof(local_name),
-  "%s/%s", local_dir, dest_name);
-  for (i = strlen(local_name) - 1 ; local_name[i] != '/' ; i--) {
+  "%s" DIR_SEPARATOR "%s", local_dir, dest_name_copy);
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  free(dest_name_copy);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+
+  for (i = strlen(local_name) - 1 ; local_name[i] != DIR_SEPARATOR_CHAR ; 
i--) {
 /* Nothing */
   }
   local_name[i] = '\0';
@@ -312,7 +341,7 @@
 secfile_destroy(control);
 return _("Cannot create required directories");
   }
-  local_name[i] = '/';
+  local_name[i] = DIR_SEPARATOR_CHAR;
 
   if (mcb != NULL) {
 char buf[2048];
@@ -333,6 +362,10 @@
 }
 partial_failure = TRUE;
   }
+} else {
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  free(dest_name_copy);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 }
 
 if (pbcb != NULL) {

Modified: branches/S2_6/tools/mpcmdline.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/mpcmdline.c?rev=32872&r1=32871&r2=32872&view=diff
==
--- branches/S2_6/tools/mpcmdline.c (original)
+++ branches/S2_6/tools/mpcmdline.c Thu Jun 16 18:45:15 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -131,7 +131,7 @@
 } else {
   static char pfx_buf[500];
 
-  snprintf(pfx_buf, sizeof(pfx_buf), "%s/.freeciv", home);
+  snprintf(pfx_buf, sizeof(pfx_buf), "%s" DIR_SEPARATOR ".freeciv", home);
   fcmp.inst_prefix = pfx_buf;
 }
   }

Modified: branches/S2_6/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=32872&r1=32871&r2=32872&view=diff
=

[Freeciv-commits] r32871 - in /trunk: tools/download.c tools/mpcmdline.c utility/shared.c utility/shared.h

[cazfi74]

Author: cazfi
Date: Thu Jun 16 18:45:03 2016
New Revision: 32871

URL: http://svn.gna.org/viewcvs/freeciv?rev=32871&view=rev
Log:
Made modpack installer to respect dir separator definition.

See bug #24677

Modified:
trunk/tools/download.c
trunk/tools/mpcmdline.c
trunk/utility/shared.c
trunk/utility/shared.h

Modified: trunk/tools/download.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/download.c?rev=32871&r1=32870&r2=32871&view=diff
==
--- trunk/tools/download.c  (original)
+++ trunk/tools/download.c  Thu Jun 16 18:45:03 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "log.h"
+#include "mem.h"
 #include "netfile.h"
 #include "registry.h"
 
@@ -167,10 +168,10 @@
 
   if (type == MPT_SCENARIO) {
 fc_snprintf(local_dir, sizeof(local_dir),
-"%s/scenarios", fcmp->inst_prefix);
+"%s" DIR_SEPARATOR "scenarios", fcmp->inst_prefix);
   } else {
 fc_snprintf(local_dir, sizeof(local_dir),
-"%s/" DATASUBDIR, fcmp->inst_prefix);
+"%s" DIR_SEPARATOR DATASUBDIR, fcmp->inst_prefix);
   }
 
   baseURLpart = secfile_lookup_str(control, "info.baseURL");
@@ -273,6 +274,13 @@
   filenbr = 0;
   for (filenbr = 0; filenbr < total_files; filenbr++) {
 const char *dest_name;
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+char *dest_name_copy;
+#else  /* DIR_SEPARATOR_IS_DEFAULT */
+#define dest_name_copy dest_name
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+
 int i;
 bool illegal_filename = FALSE;
 
@@ -286,6 +294,10 @@
   /* Missing dest name is ok, we just default to src_name */
   dest_name = src_name;
 }
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+dest_name_copy = fc_malloc(strlen(dest_name) + 1);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 
 for (i = 0; dest_name[i] != '\0'; i++) {
   if (dest_name[i] == '.' && dest_name[i+1] == '.') {
@@ -299,12 +311,29 @@
 partial_failure = TRUE;
 illegal_filename = TRUE;
   }
-}
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  if (dest_name[i] == '/') {
+dest_name_copy[i] = DIR_SEPARATOR_CHAR;
+  } else {
+dest_name_copy[i] = dest_name[i];
+  }
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+}
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+dest_name_copy[i] = '\0';
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 
 if (!illegal_filename) {
   fc_snprintf(local_name, sizeof(local_name),
-  "%s/%s", local_dir, dest_name);
-  for (i = strlen(local_name) - 1 ; local_name[i] != '/' ; i--) {
+  "%s" DIR_SEPARATOR "%s", local_dir, dest_name_copy);
+
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  free(dest_name_copy);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
+
+  for (i = strlen(local_name) - 1 ; local_name[i] != DIR_SEPARATOR_CHAR ; 
i--) {
 /* Nothing */
   }
   local_name[i] = '\0';
@@ -312,7 +341,7 @@
 secfile_destroy(control);
 return _("Cannot create required directories");
   }
-  local_name[i] = '/';
+  local_name[i] = DIR_SEPARATOR_CHAR;
 
   if (mcb != NULL) {
 char buf[2048];
@@ -333,6 +362,10 @@
 }
 partial_failure = TRUE;
   }
+} else {
+#ifndef DIR_SEPARATOR_IS_DEFAULT
+  free(dest_name_copy);
+#endif /* DIR_SEPARATOR_IS_DEFAULT */
 }
 
 if (pbcb != NULL) {

Modified: trunk/tools/mpcmdline.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/mpcmdline.c?rev=32871&r1=32870&r2=32871&view=diff
==
--- trunk/tools/mpcmdline.c (original)
+++ trunk/tools/mpcmdline.c Thu Jun 16 18:45:03 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

Modified: trunk/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=32871&r1=32870&r2=32871&view=diff
==
--- trunk/utility/shared.c  (original)
+++ trunk/utility/shared.c  Thu Jun 16 18:45:03 2016
@@ -1275,7 +1275,7 @@
 return astr_str(&realfile);
   }
 
-#ifdef WIN32_NATIVE
+#ifndef DIR_SEPARATOR_IS_DEFAULT
   for (i = 0; filename[i] != '\0'; i++) {
 if (filename[i] == '/') {
   

[Freeciv-commits] r32869 - /branches/S2_6/common/player.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 14:20:26 2016
New Revision: 32869

URL: http://svn.gna.org/viewcvs/freeciv?rev=32869&view=rev
Log:
Added comment about armistice to players_non_invade()

See bug #24651

Modified:
branches/S2_6/common/player.c

Modified: branches/S2_6/common/player.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/player.c?rev=32869&r1=32868&r2=32869&view=diff
==
--- branches/S2_6/common/player.c   (original)
+++ branches/S2_6/common/player.c   Thu Jun 16 14:20:26 2016
@@ -1288,6 +1288,9 @@
 return FALSE;
   }
 
+  /* Movement during armistice is allowed so that player can withdraw
+ units deeper inside opponent territory. */
+
   return player_diplstate_get(pplayer1, pplayer2)->type == DS_PEACE;
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32870 - /branches/S2_5/common/player.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 14:20:30 2016
New Revision: 32870

URL: http://svn.gna.org/viewcvs/freeciv?rev=32870&view=rev
Log:
Added comment about armistice to players_non_invade()

See bug #24651

Modified:
branches/S2_5/common/player.c

Modified: branches/S2_5/common/player.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/player.c?rev=32870&r1=32869&r2=32870&view=diff
==
--- branches/S2_5/common/player.c   (original)
+++ branches/S2_5/common/player.c   Thu Jun 16 14:20:30 2016
@@ -1303,10 +1303,15 @@
   if (pplayer1 == pplayer2 || !pplayer1 || !pplayer2) {
 return FALSE;
   }
+
   if (is_barbarian(pplayer1) || is_barbarian(pplayer2)) {
 /* Likely an unnecessary test. */
 return FALSE;
   }
+
+  /* Movement during armistice is allowed so that player can withdraw
+ units deeper inside opponent territory. */
+
   return player_diplstate_get(pplayer1, pplayer2)->type == DS_PEACE;
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32868 - /trunk/common/player.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 14:20:20 2016
New Revision: 32868

URL: http://svn.gna.org/viewcvs/freeciv?rev=32868&view=rev
Log:
Added comment about armistice to players_non_invade()

See bug #24651

Modified:
trunk/common/player.c

Modified: trunk/common/player.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/player.c?rev=32868&r1=32867&r2=32868&view=diff
==
--- trunk/common/player.c   (original)
+++ trunk/common/player.c   Thu Jun 16 14:20:20 2016
@@ -1291,6 +1291,9 @@
 return FALSE;
   }
 
+  /* Movement during armistice is allowed so that player can withdraw
+ units deeper inside opponent territory. */
+
   return player_diplstate_get(pplayer1, pplayer2)->type == DS_PEACE;
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32867 - /branches/S2_5/doc/README.packaging

[cazfi74]

Author: cazfi
Date: Thu Jun 16 11:06:37 2016
New Revision: 32867

URL: http://svn.gna.org/viewcvs/freeciv?rev=32867&view=rev
Log:
Documented FREECIV_LABEL_FORCE

See patch #7217

Modified:
branches/S2_5/doc/README.packaging

Modified: branches/S2_5/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README.packaging?rev=32867&r1=32866&r2=32867&view=diff
==
--- branches/S2_5/doc/README.packaging  (original)
+++ branches/S2_5/doc/README.packaging  Thu Jun 16 11:06:37 2016
@@ -69,6 +69,15 @@
 FREECIV_DISTRIBUTOR in fc_version to match. This information is sent
 by client to (public) server so in case there's any problems with certain
 clients, we know a bit more what kind of code they are using.
+
+--
+Configure time version number adjustment
+
+
+The version label part of the version number can be set via
+configure time environment variable FREECIV_LABEL_FORCE.
+If the variable contains tag "", that gets replaced with the
+label that would be used if FREECIV_LABEL_FORCE was not set at all.
 
 --
 Announcement of new versions


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32865 - /trunk/doc/README.packaging

[cazfi74]

Author: cazfi
Date: Thu Jun 16 11:06:27 2016
New Revision: 32865

URL: http://svn.gna.org/viewcvs/freeciv?rev=32865&view=rev
Log:
Documented FREECIV_LABEL_FORCE

See patch #7217

Modified:
trunk/doc/README.packaging

Modified: trunk/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=32865&r1=32864&r2=32865&view=diff
==
--- trunk/doc/README.packaging  (original)
+++ trunk/doc/README.packaging  Thu Jun 16 11:06:27 2016
@@ -69,6 +69,15 @@
 project definition file. Once you have made definition file for a
 freeciv fork project, you can build freeciv using it by giving
 configure option --with-project-definition=
+
+--
+Configure time version number adjustment
+
+
+The version label part of the version number can be set via
+configure time environment variable FREECIV_LABEL_FORCE.
+If the variable contains tag "", that gets replaced with the
+label that would be used if FREECIV_LABEL_FORCE was not set at all.
 
 --
 Announcement of new versions


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32866 - /branches/S2_6/doc/README.packaging

[cazfi74]

Author: cazfi
Date: Thu Jun 16 11:06:31 2016
New Revision: 32866

URL: http://svn.gna.org/viewcvs/freeciv?rev=32866&view=rev
Log:
Documented FREECIV_LABEL_FORCE

See patch #7217

Modified:
branches/S2_6/doc/README.packaging

Modified: branches/S2_6/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=32866&r1=32865&r2=32866&view=diff
==
--- branches/S2_6/doc/README.packaging  (original)
+++ branches/S2_6/doc/README.packaging  Thu Jun 16 11:06:31 2016
@@ -78,6 +78,15 @@
 clients, we know a bit more what kind of code they are using.
 
 --
+Configure time version number adjustment
+
+
+The version label part of the version number can be set via
+configure time environment variable FREECIV_LABEL_FORCE.
+If the variable contains tag "", that gets replaced with the
+label that would be used if FREECIV_LABEL_FORCE was not set at all.
+
+--
 Announcement of new versions
 
 As of 2.4, the Freeciv client displays the latest available version if


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32864 - in /branches/S2_5/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 10:57:38 2016
New Revision: 32864

URL: http://svn.gna.org/viewcvs/freeciv?rev=32864&view=rev
Log:
Made property editor not to lose other game properties when editing
other one.

See bug #24627

Modified:
branches/S2_5/client/gui-gtk-2.0/editprop.c
branches/S2_5/client/gui-gtk-3.0/editprop.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=32864&r1=32863&r2=32864&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/editprop.c Thu Jun 16 10:57:38 2016
@@ -2271,7 +2271,7 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_desc, pgame->scenario.description);
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
 }
 return;
 

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=32864&r1=32863&r2=32864&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/editprop.c Thu Jun 16 10:57:38 2016
@@ -2271,7 +2271,7 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_desc, pgame->scenario.description);
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
 }
 return;
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32863 - in /branches/S2_6/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 10:57:31 2016
New Revision: 32863

URL: http://svn.gna.org/viewcvs/freeciv?rev=32863&view=rev
Log:
Made property editor not to lose other game properties when editing
other one.

See bug #24627

Modified:
branches/S2_6/client/gui-gtk-2.0/editprop.c
branches/S2_6/client/gui-gtk-3.0/editprop.c

Modified: branches/S2_6/client/gui-gtk-2.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/editprop.c?rev=32863&r1=32862&r2=32863&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/editprop.c Thu Jun 16 10:57:31 2016
@@ -2337,8 +2337,11 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
   sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+  packet->scenario_random = pgame->scenario.save_random;
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
+  packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+  packet->lake_flooding = pgame->scenario.lake_flooding;
 }
 return;
 

Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=32863&r1=32862&r2=32863&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Thu Jun 16 10:57:31 2016
@@ -2338,8 +2338,11 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
   sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+  packet->scenario_random = pgame->scenario.save_random;
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
+  packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+  packet->lake_flooding = pgame->scenario.lake_flooding;
 }
 return;
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32862 - in /trunk/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c gui-gtk-3.x/editprop.c

[cazfi74]

Author: cazfi
Date: Thu Jun 16 10:57:21 2016
New Revision: 32862

URL: http://svn.gna.org/viewcvs/freeciv?rev=32862&view=rev
Log:
Made property editor not to lose other game properties when editing
other one.

See bug #24627

Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.x/editprop.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=32862&r1=32861&r2=32862&view=diff
==
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Thu Jun 16 10:57:21 2016
@@ -2341,8 +2341,11 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
   sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+  packet->scenario_random = pgame->scenario.save_random;
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
+  packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+  packet->lake_flooding = pgame->scenario.lake_flooding;
 }
 return;
 

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=32862&r1=32861&r2=32862&view=diff
==
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Thu Jun 16 10:57:21 2016
@@ -2342,8 +2342,11 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
   sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+  packet->scenario_random = pgame->scenario.save_random;
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
+  packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+  packet->lake_flooding = pgame->scenario.lake_flooding;
 }
 return;
 

Modified: trunk/client/gui-gtk-3.x/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/editprop.c?rev=32862&r1=32861&r2=32862&view=diff
==
--- trunk/client/gui-gtk-3.x/editprop.c (original)
+++ trunk/client/gui-gtk-3.x/editprop.c Thu Jun 16 10:57:21 2016
@@ -2342,8 +2342,11 @@
   sz_strlcpy(packet->scenario_name, pgame->scenario.name);
   sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
   sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+  packet->scenario_random = pgame->scenario.save_random;
   packet->scenario_players = pgame->scenario.players;
-  /* TODO: Set more packet fields. */
+  packet->startpos_nations = pgame->scenario.startpos_nations;
+  packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+  packet->lake_flooding = pgame->scenario.lake_flooding;
 }
 return;
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32851 - in /branches/S2_6/data/civ2civ3: README.civ2civ3 buildings.ruleset effects.ruleset game.ruleset governments.ruleset

[cazfi74]

Author: cazfi
Date: Tue Jun 14 17:15:32 2016
New Revision: 32851

URL: http://svn.gna.org/viewcvs/freeciv?rev=32851&view=rev
Log:
Added Ecclesiastical Palace to civ2civ3 ruleset.

Patch by David Fernandez 

See patch #7159

Modified:
branches/S2_6/data/civ2civ3/README.civ2civ3
branches/S2_6/data/civ2civ3/buildings.ruleset
branches/S2_6/data/civ2civ3/effects.ruleset
branches/S2_6/data/civ2civ3/game.ruleset
branches/S2_6/data/civ2civ3/governments.ruleset

Modified: branches/S2_6/data/civ2civ3/README.civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/README.civ2civ3?rev=32851&r1=32850&r2=32851&view=diff
==
--- branches/S2_6/data/civ2civ3/README.civ2civ3 (original)
+++ branches/S2_6/data/civ2civ3/README.civ2civ3 Tue Jun 14 17:15:32 2016
@@ -402,7 +402,7 @@
   receives all them).
 
 - Spies built under Communism or Federation will start at the first
-  veteran level. Federation grants +1 Luxury per city.
+  veteran level. Federation grants +3 Luxury per city.
 
 - Under Communism you do not pay upkeep for buildings that cost 1 Gold.
   Communism cancels the bonus from Mysticism and Theology (to Temples
@@ -512,6 +512,10 @@
 - Aqueduct is cheaper near rivers or lakes. Sewer System is needed to
   grow larger than pop 16 (instead of 12). Each one reduces the chances
   of illness by -30%.
+
+- Created a new building: Ecclesiastical Palace (available with
+  Theology), that acts as a second center of government that lowers
+  corruption and waste.
 
 - Courthouse: Make_Content = 1, and reduces to half any kind of waste
   (Trade, Shields or Food).
@@ -896,7 +900,7 @@
   classes).
 - Wonders become obsolete by techs researched by the owner (not affected
   by the researches of other players).
-- A little boost to Federation (+1 Luxury per city, so it is easier to
+- A little boost to Federation (+3 Luxury per city, so it is easier to
   celebrate), and Fundamentalism (-50% to science, instead of total
   science output halved).
 - The bonus to defense moved to cities with pop>8 (instead of pop>=8),

Modified: branches/S2_6/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/buildings.ruleset?rev=32851&r1=32850&r2=32851&view=diff
==
--- branches/S2_6/data/civ2civ3/buildings.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/buildings.ruleset   Tue Jun 14 17:15:32 2016
@@ -737,10 +737,6 @@
 name   = _("Palace")
 genus  = "SmallWonder"
 flags  = "SaveSmallWonder"
-reqs   =
-{ "type", "name", "range"
-  "Tech", "Masonry", "Player"
-}
 graphic= "b.palace"
 graphic_alt= "-"
 obsolete_by=
@@ -773,6 +769,43 @@
 If the capital is in a dangerous location, or a more central capital\
  would give a better corruption distribution, you can move your palace\
  by rebuilding it in another city.\
+"),
+; /* xgettext:no-c-format */
+_("\
+Under Despotism the city containing the palace gains a +75% \
+gold bonus, and under Monarchy a +50% gold bonus.\
+")
+
+[building_ecclesiastical_palace]
+name   = _("Ecclesiastical Palace")
+genus  = "SmallWonder"
+reqs   =
+{ "type", "name", "range"
+  "Tech", "Theology", "Player"
+}
+graphic= "b.ecclesiastical_palace"
+graphic_alt= "b.palace"
+obsolete_by=
+{ "type", "name", "range"
+}
+build_cost = 140
+upkeep = 0
+sabotage   = 0
+sound  = "b_palace"
+sound_alt  = "b_generic"
+helptext   = _("\
+Makes a city the ecclesiastical capital, that acts as a second center \
+of government.\
+"), _("\
+Waste in other cities (corruption, production waste, and food waste) \
+is related to how far away from the nearest capital they are. On top of \
+this, corruption and production waste in the capital itself is half \
+of what it would otherwise be (and a Courthouse will eliminate it \
+entirely).\
+"), _("\
+The city where this palace is located cannot be incited to revolt, \
+and enjoys a bonus when enemy agents try to evade your own agents \
+stationed in the city, or sabotage your buildings.\
 "),
 ; /* xgettext:no-c-format */
 _("\

Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=32851&r1=32850&r2=32851&view=diff
==
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Tue Jun 14 17:15:32 2016
@@ -1623,7 +1623,7 @@
 
 [effect_lux_federation]
 type= "Output_Add_Tile"
-value   = 1
+value   = 3
 reqs=
 { "type", "name", "range"
   "Gov", "Federation", "Player"
@@ -2469,6 +2469,75 @@
   "Building", "Palace", "City"
 }
 
+[effect_ecclesiastical_palace]
+type= "Output_Waste

[Freeciv-commits] r32850 - in /trunk/data/civ2civ3: README.civ2civ3 buildings.ruleset effects.ruleset game.ruleset governments.ruleset

[cazfi74]

Author: cazfi
Date: Tue Jun 14 17:15:24 2016
New Revision: 32850

URL: http://svn.gna.org/viewcvs/freeciv?rev=32850&view=rev
Log:
Added Ecclesiastical Palace to civ2civ3 ruleset.

Patch by David Fernandez 

See patch #7159

Modified:
trunk/data/civ2civ3/README.civ2civ3
trunk/data/civ2civ3/buildings.ruleset
trunk/data/civ2civ3/effects.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/civ2civ3/governments.ruleset

Modified: trunk/data/civ2civ3/README.civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/README.civ2civ3?rev=32850&r1=32849&r2=32850&view=diff
==
--- trunk/data/civ2civ3/README.civ2civ3 (original)
+++ trunk/data/civ2civ3/README.civ2civ3 Tue Jun 14 17:15:24 2016
@@ -402,7 +402,7 @@
   receives all them).
 
 - Spies built under Communism or Federation will start at the first
-  veteran level. Federation grants +1 Luxury per city.
+  veteran level. Federation grants +3 Luxury per city.
 
 - Under Communism you do not pay upkeep for buildings that cost 1 Gold.
   Communism cancels the bonus from Mysticism and Theology (to Temples
@@ -512,6 +512,10 @@
 - Aqueduct is cheaper near rivers or lakes. Sewer System is needed to
   grow larger than pop 16 (instead of 12). Each one reduces the chances
   of illness by -30%.
+
+- Created a new building: Ecclesiastical Palace (available with
+  Theology), that acts as a second center of government that lowers
+  corruption and waste.
 
 - Courthouse: Make_Content = 1, and reduces to half any kind of waste
   (Trade, Shields or Food).
@@ -896,7 +900,7 @@
   classes).
 - Wonders become obsolete by techs researched by the owner (not affected
   by the researches of other players).
-- A little boost to Federation (+1 Luxury per city, so it is easier to
+- A little boost to Federation (+3 Luxury per city, so it is easier to
   celebrate), and Fundamentalism (-50% to science, instead of total
   science output halved).
 - The bonus to defense moved to cities with pop>8 (instead of pop>=8),

Modified: trunk/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/buildings.ruleset?rev=32850&r1=32849&r2=32850&view=diff
==
--- trunk/data/civ2civ3/buildings.ruleset   (original)
+++ trunk/data/civ2civ3/buildings.ruleset   Tue Jun 14 17:15:24 2016
@@ -741,10 +741,6 @@
 name   = _("Palace")
 genus  = "SmallWonder"
 flags  = "SaveSmallWonder"
-reqs   =
-{ "type", "name", "range"
-  "Tech", "Masonry", "Player"
-}
 graphic= "b.palace"
 graphic_alt= "-"
 obsolete_by=
@@ -777,6 +773,43 @@
 If the capital is in a dangerous location, or a more central capital\
  would give a better corruption distribution, you can move your palace\
  by rebuilding it in another city.\
+"),
+; /* xgettext:no-c-format */
+_("\
+Under Despotism the city containing the palace gains a +75% \
+gold bonus, and under Monarchy a +50% gold bonus.\
+")
+
+[building_ecclesiastical_palace]
+name   = _("Ecclesiastical Palace")
+genus  = "SmallWonder"
+reqs   =
+{ "type", "name", "range"
+  "Tech", "Theology", "Player"
+}
+graphic= "b.ecclesiastical_palace"
+graphic_alt= "b.palace"
+obsolete_by=
+{ "type", "name", "range"
+}
+build_cost = 140
+upkeep = 0
+sabotage   = 0
+sound  = "b_palace"
+sound_alt  = "b_generic"
+helptext   = _("\
+Makes a city the ecclesiastical capital, that acts as a second center \
+of government.\
+"), _("\
+Waste in other cities (corruption, production waste, and food waste) \
+is related to how far away from the nearest capital they are. On top of \
+this, corruption and production waste in the capital itself is half \
+of what it would otherwise be (and a Courthouse will eliminate it \
+entirely).\
+"), _("\
+The city where this palace is located cannot be incited to revolt, \
+and enjoys a bonus when enemy agents try to evade your own agents \
+stationed in the city, or sabotage your buildings.\
 "),
 ; /* xgettext:no-c-format */
 _("\

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=32850&r1=32849&r2=32850&view=diff
==
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Tue Jun 14 17:15:24 2016
@@ -1624,7 +1624,7 @@
 
 [effect_lux_federation]
 type= "Output_Add_Tile"
-value   = 1
+value   = 3
 reqs=
 { "type", "name", "range"
   "Gov", "Federation", "Player"
@@ -2478,6 +2478,75 @@
   "Building", "Palace", "City"
 }
 
+[effect_ecclesiastical_palace]
+type= "Output_Waste_Pct"
+value   = 50
+reqs=
+{ "type", "name", "range", "present"
+  "Building", "Ecclesiastical Palace", "City", TRUE
+ 

[Freeciv-commits] r32839 - in /branches/S2_6/common: movement.c movement.h

[cazfi74]

Author: cazfi
Date: Sun Jun 12 14:50:58 2016
New Revision: 32839

URL: http://svn.gna.org/viewcvs/freeciv?rev=32839&view=rev
Log:
Inlined is_native_tile_to_class().

See patch #7201

Modified:
branches/S2_6/common/movement.c
branches/S2_6/common/movement.h

Modified: branches/S2_6/common/movement.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/movement.c?rev=32839&r1=32838&r2=32839&view=diff
==
--- branches/S2_6/common/movement.c (original)
+++ branches/S2_6/common/movement.c Sun Jun 12 14:50:58 2016
@@ -267,19 +267,6 @@
 const struct tile *ptile)
 {
   return is_native_to_class(utype_class(punittype), tile_terrain(ptile),
-tile_extras(ptile));
-}
-
-
-/
-  This tile is native to unit class.
-
-  See is_native_to_class()
-/
-bool is_native_tile_to_class(const struct unit_class *punitclass,
- const struct tile *ptile)
-{
-  return is_native_to_class(punitclass, tile_terrain(ptile),
 tile_extras(ptile));
 }
 

Modified: branches/S2_6/common/movement.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/movement.h?rev=32839&r1=32838&r2=32839&view=diff
==
--- branches/S2_6/common/movement.h (original)
+++ branches/S2_6/common/movement.h Sun Jun 12 14:50:58 2016
@@ -64,11 +64,23 @@
 
 bool is_native_tile(const struct unit_type *punittype,
 const struct tile *ptile);
-bool is_native_tile_to_class(const struct unit_class *punitclass,
- const struct tile *ptile);
+
 bool is_native_to_class(const struct unit_class *punitclass,
 const struct terrain *pterrain,
 const bv_extras *extras);
+
+/
+  Check if this tile is native to given unit class.
+
+  See is_native_to_class()
+/
+static inline bool is_native_tile_to_class(const struct unit_class *punitclass,
+   const struct tile *ptile)
+{
+  return is_native_to_class(punitclass, tile_terrain(ptile),
+tile_extras(ptile));
+}
+
 bool is_native_move(const struct unit_class *punitclass,
 const struct tile *src_tile,
 const struct tile *dst_tile);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32838 - in /trunk/common: movement.c movement.h

[cazfi74]

Author: cazfi
Date: Sun Jun 12 14:50:34 2016
New Revision: 32838

URL: http://svn.gna.org/viewcvs/freeciv?rev=32838&view=rev
Log:
Inlined is_native_tile_to_class().

See patch #7201

Modified:
trunk/common/movement.c
trunk/common/movement.h

Modified: trunk/common/movement.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.c?rev=32838&r1=32837&r2=32838&view=diff
==
--- trunk/common/movement.c (original)
+++ trunk/common/movement.c Sun Jun 12 14:50:34 2016
@@ -267,19 +267,6 @@
 const struct tile *ptile)
 {
   return is_native_to_class(utype_class(punittype), tile_terrain(ptile),
-tile_extras(ptile));
-}
-
-
-/
-  This tile is native to unit class.
-
-  See is_native_to_class()
-/
-bool is_native_tile_to_class(const struct unit_class *punitclass,
- const struct tile *ptile)
-{
-  return is_native_to_class(punitclass, tile_terrain(ptile),
 tile_extras(ptile));
 }
 

Modified: trunk/common/movement.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.h?rev=32838&r1=32837&r2=32838&view=diff
==
--- trunk/common/movement.h (original)
+++ trunk/common/movement.h Sun Jun 12 14:50:34 2016
@@ -64,11 +64,23 @@
 
 bool is_native_tile(const struct unit_type *punittype,
 const struct tile *ptile);
-bool is_native_tile_to_class(const struct unit_class *punitclass,
- const struct tile *ptile);
+
 bool is_native_to_class(const struct unit_class *punitclass,
 const struct terrain *pterrain,
 const bv_extras *extras);
+
+/
+  Check if this tile is native to given unit class.
+
+  See is_native_to_class()
+/
+static inline bool is_native_tile_to_class(const struct unit_class *punitclass,
+   const struct tile *ptile)
+{
+  return is_native_to_class(punitclass, tile_terrain(ptile),
+tile_extras(ptile));
+}
+
 bool is_native_move(const struct unit_class *punitclass,
 const struct tile *src_tile,
 const struct tile *dst_tile);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32835 - /trunk/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Sun Jun 12 10:51:26 2016
New Revision: 32835

URL: http://svn.gna.org/viewcvs/freeciv?rev=32835&view=rev
Log:
Do not allow player observer to start the game for the player.

See bug #24678

Modified:
trunk/server/stdinhand.c

Modified: trunk/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/stdinhand.c?rev=32835&r1=32834&r2=32835&view=diff
==
--- trunk/server/stdinhand.c(original)
+++ trunk/server/stdinhand.cSun Jun 12 10:51:26 2016
@@ -5714,7 +5714,7 @@
   }
   start_game();
   return TRUE;
-} else if (NULL == caller->playing || !caller->playing->is_connected) {
+} else if (NULL == caller->playing || caller->observer) {
   /* A detached or observer player can't do /start. */
   return TRUE;
 } else {


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32837 - /branches/S2_5/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Sun Jun 12 10:51:42 2016
New Revision: 32837

URL: http://svn.gna.org/viewcvs/freeciv?rev=32837&view=rev
Log:
Do not allow player observer to start the game for the player.

See bug #24678

Modified:
branches/S2_5/server/stdinhand.c

Modified: branches/S2_5/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/stdinhand.c?rev=32837&r1=32836&r2=32837&view=diff
==
--- branches/S2_5/server/stdinhand.c(original)
+++ branches/S2_5/server/stdinhand.cSun Jun 12 10:51:42 2016
@@ -5705,7 +5705,7 @@
   }
   start_game();
   return TRUE;
-} else if (NULL == caller->playing || !caller->playing->is_connected) {
+} else if (NULL == caller->playing || caller->observer) {
   /* A detached or observer player can't do /start. */
   return TRUE;
 } else {


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32836 - /branches/S2_6/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Sun Jun 12 10:51:35 2016
New Revision: 32836

URL: http://svn.gna.org/viewcvs/freeciv?rev=32836&view=rev
Log:
Do not allow player observer to start the game for the player.

See bug #24678

Modified:
branches/S2_6/server/stdinhand.c

Modified: branches/S2_6/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/stdinhand.c?rev=32836&r1=32835&r2=32836&view=diff
==
--- branches/S2_6/server/stdinhand.c(original)
+++ branches/S2_6/server/stdinhand.cSun Jun 12 10:51:35 2016
@@ -5707,7 +5707,7 @@
   }
   start_game();
   return TRUE;
-} else if (NULL == caller->playing || !caller->playing->is_connected) {
+} else if (NULL == caller->playing || caller->observer) {
   /* A detached or observer player can't do /start. */
   return TRUE;
 } else {


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32834 - in /trunk: common/game.h tools/civmanual.c tools/ruledit/ruledit.cpp tools/ruleup.c

[cazfi74]

Author: cazfi
Date: Sat Jun 11 21:13:53 2016
New Revision: 32834

URL: http://svn.gna.org/viewcvs/freeciv?rev=32834&view=rev
Log:
Added i_am_tool() function. It's just a wrapper around i_am_server(), but makes
API (and callers) more clear about what is going on.

See patch #7232

Modified:
trunk/common/game.h
trunk/tools/civmanual.c
trunk/tools/ruledit/ruledit.cpp
trunk/tools/ruleup.c

Modified: trunk/common/game.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.h?rev=32834&r1=32833&r2=32834&view=diff
==
--- trunk/common/game.h (original)
+++ trunk/common/game.h Sat Jun 11 21:13:53 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -285,6 +285,10 @@
 bool is_server(void);
 void i_am_server(void);
 void i_am_client(void);
+static inline void i_am_tool(void)
+{
+  i_am_server(); /* No difference between a tool and server at the moment */
+}
 
 void game_init(void);
 void game_map_init(void);

Modified: trunk/tools/civmanual.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/civmanual.c?rev=32834&r1=32833&r2=32834&view=diff
==
--- trunk/tools/civmanual.c (original)
+++ trunk/tools/civmanual.c Sat Jun 11 21:13:53 2016
@@ -652,9 +652,8 @@
srvarg.fatal_assertions);
   /* logging available after this point */
 
-  /* Imitate a server - this is needed for as some function only work if this
-   * is set. */
-  i_am_server();
+  /* Get common code to treat us as a tool. */
+  i_am_tool();
 
   /* Initialize game with default values */
   game_init();

Modified: trunk/tools/ruledit/ruledit.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit.cpp?rev=32834&r1=32833&r2=32834&view=diff
==
--- trunk/tools/ruledit/ruledit.cpp (original)
+++ trunk/tools/ruledit/ruledit.cpp Sat Jun 11 21:13:53 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 /* ANSI */
 #include 
 
-#ifdef WIN32_NATIVE
+#ifdef FREECIV_MS_WINDOWS
 #include 
 #endif
 
@@ -97,7 +97,7 @@
 game.info.aifill = 0;
 
 game_init();
-i_am_server();
+i_am_tool();
 
 if (comments_load()) {
 

Modified: trunk/tools/ruleup.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleup.c?rev=32834&r1=32833&r2=32834&view=diff
==
--- trunk/tools/ruleup.c(original)
+++ trunk/tools/ruleup.cSat Jun 11 21:13:53 2016
@@ -112,7 +112,7 @@
   settings_init(FALSE);
 
   game_init();
-  i_am_server();
+  i_am_tool();
 
   rup_parse_cmdline(argc, argv);
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32833 - /trunk/translations/core/fi.po

[cazfi74]

Author: cazfi
Date: Sat Jun 11 15:51:55 2016
New Revision: 32833

URL: http://svn.gna.org/viewcvs/freeciv?rev=32833&view=rev
Log:
Updated Finnish translation. This is just S2_6 translation msgmerged against 
latest TRUNK strings.

Modified:
trunk/translations/core/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/translations/core/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/fi.po?rev=32833&r1=32832&r2=32833&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32832 - /branches/S2_6/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Sat Jun 11 15:47:39 2016
New Revision: 32832

URL: http://svn.gna.org/viewcvs/freeciv?rev=32832&view=rev
Log:
Updated Finnish translation.

Modified:
branches/S2_6/translations/freeciv/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fi.po?rev=32832&r1=32831&r2=32832&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32831 - /branches/S2_5/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Sat Jun 11 15:44:41 2016
New Revision: 32831

URL: http://svn.gna.org/viewcvs/freeciv?rev=32831&view=rev
Log:
Updated Finnish translation.

Modified:
branches/S2_5/translations/freeciv/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fi.po?rev=32831&r1=32830&r2=32831&view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32830 - /branches/S2_6/client/options.c

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:29:51 2016
New Revision: 32830

URL: http://svn.gna.org/viewcvs/freeciv?rev=32830&view=rev
Log:
Fixed creation of storage dir for options file when dir separator not '/'

See bug #24676

Modified:
branches/S2_6/client/options.c

Modified: branches/S2_6/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=32830&r1=32829&r2=32830&view=diff
==
--- branches/S2_6/client/options.c  (original)
+++ branches/S2_6/client/options.c  Sat Jun 11 14:29:51 2016
@@ -5622,7 +5622,7 @@
 
   /* Directory name */
   strncpy(dir_name, name, sizeof(dir_name));
-  for (i = strlen(dir_name) - 1 ; dir_name[i] != '/' && i >= 0; i--) {
+  for (i = strlen(dir_name) - 1 ; dir_name[i] != DIR_SEPARATOR_CHAR && i >= 0; 
i--) {
 /* Nothing */
   }
   if (i > 0) {


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32829 - /trunk/client/options.c

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:29:46 2016
New Revision: 32829

URL: http://svn.gna.org/viewcvs/freeciv?rev=32829&view=rev
Log:
Fixed creation of storage dir for options file when dir separator not '/'

See bug #24676

Modified:
trunk/client/options.c

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=32829&r1=32828&r2=32829&view=diff
==
--- trunk/client/options.c  (original)
+++ trunk/client/options.c  Sat Jun 11 14:29:46 2016
@@ -5901,7 +5901,7 @@
 
   /* Directory name */
   strncpy(dir_name, name, sizeof(dir_name));
-  for (i = strlen(dir_name) - 1 ; dir_name[i] != '/' && i >= 0; i--) {
+  for (i = strlen(dir_name) - 1 ; dir_name[i] != DIR_SEPARATOR_CHAR && i >= 0; 
i--) {
 /* Nothing */
   }
   if (i > 0) {


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32828 - in /branches/S2_5: bootstrap/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-xaw/ data/

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:25:33 2016
New Revision: 32828

URL: http://svn.gna.org/viewcvs/freeciv?rev=32828&view=rev
Log:
Corrected mentions of README.cma to refer to README.governor instead.

Some instances of the problem reported by Jacob Nevins 

See bug #24650

Modified:
branches/S2_5/bootstrap/freeciv.spec.in
branches/S2_5/client/gui-gtk-2.0/cma_fe.c
branches/S2_5/client/gui-gtk-3.0/cma_fe.c
branches/S2_5/client/gui-xaw/cma_fe.c
branches/S2_5/data/helpdata.txt

Modified: branches/S2_5/bootstrap/freeciv.spec.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv.spec.in?rev=32828&r1=32827&r2=32828&view=diff
==
--- branches/S2_5/bootstrap/freeciv.spec.in (original)
+++ branches/S2_5/bootstrap/freeciv.spec.in Sat Jun 11 14:25:33 2016
@@ -233,7 +233,7 @@
 %defattr(644, root, root, 0755)
 %doc COPYING NEWS
 %doc doc/BUGS doc/HACKING doc/README
-%doc doc/README.AI doc/README.agents doc/README.attributes doc/README.cma
+%doc doc/README.AI doc/README.agents doc/README.attributes doc/README.governor
 %doc doc/README.delta doc/README.effects doc/README.ftwl
 #README.graphics and README.sound are included in client package
 %doc doc/README.scorelog doc/TODO

Modified: branches/S2_5/client/gui-gtk-2.0/cma_fe.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/cma_fe.c?rev=32828&r1=32827&r2=32828&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/cma_fe.c   (original)
+++ branches/S2_5/client/gui-gtk-2.0/cma_fe.c   Sat Jun 11 14:25:33 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2001 - R. Falke, M. Kaufman
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -207,7 +207,7 @@
 }
 
 /**
- instantiates a new struct for each city_dialog window that is open.
+  Instantiates a new struct for each city_dialog window that is open.
 **/
 struct cma_dialog *create_cma_dialog(struct city *pcity)
 {
@@ -226,7 +226,7 @@
   pdialog->shell = gtk_vbox_new(FALSE, 8);
   gtk_container_set_border_width(GTK_CONTAINER(pdialog->shell), 8);
   g_signal_connect(pdialog->shell, "destroy",
-  G_CALLBACK(cma_dialog_destroy_callback), pdialog);
+   G_CALLBACK(cma_dialog_destroy_callback), pdialog);
 
   page = gtk_hbox_new(FALSE, 12);
   gtk_box_pack_start(GTK_BOX(pdialog->shell), page, TRUE, TRUE, 0);
@@ -236,9 +236,9 @@
 
   sw = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
- GTK_SHADOW_ETCHED_IN);
+  GTK_SHADOW_ETCHED_IN);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
   store = gtk_list_store_new(1, G_TYPE_STRING);
   pdialog->store = store;
@@ -250,20 +250,20 @@
   pdialog->selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
 
   g_signal_connect(pdialog->preset_list, "button_press_event",
-  G_CALLBACK(button_press_callback), pdialog);
+   G_CALLBACK(button_press_callback), pdialog);
 
   gtk_widget_set_tooltip_text(view,
   _("For information on\n"
 "the citizen governor and governor presets,\n"
 "including sample presets,\n"
-"see README.cma."));
+"see README.governor."));
 
   rend = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes(NULL, rend,
-  "text", 0, NULL);
+"text", 0, NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
   gtk_tree_view_column_set_cell_data_func(column, rend, cell_data_func,
-  pdialog, NULL);
+  pdialog, NULL);
 
   label = g_object_new(GTK_TYPE_LABEL,
"use-underline", TRUE,
@@ -276,9 +276,9 @@
   gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
   g_signal_connect(view, "row_activated",
-  G_CALLBACK(cma_activate_preset_callback), pdialog);
+   G_CALLBACK(cma_activate_preset_callback), pdialog);
   g_signal_connect(view, "key-press-event",
-  G_CALLBACK(cma_preset_key_pressed_callback), pdialog);
+   G_CALLBACK(cma_preset_key_pressed_callback), p

[Freeciv-commits] r32826 - /trunk/data/helpdata.txt

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:25:02 2016
New Revision: 32826

URL: http://svn.gna.org/viewcvs/freeciv?rev=32826&view=rev
Log:
Corrected mentions of README.cma to refer to README.governor instead.

Additional instances of the problem reported by Jacob Nevins 

See bug #24650

Modified:
trunk/data/helpdata.txt

Modified: trunk/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=32826&r1=32825&r2=32826&view=diff
==
--- trunk/data/helpdata.txt (original)
+++ trunk/data/helpdata.txt Sat Jun 11 14:25:02 2016
@@ -1803,7 +1803,7 @@
 encounter some difficulties with managing cities nearby, by hand. \
 It's best to manage all cities on an island either by hand or by \
 governor. Read more hints, some background information, and some \
-preset examples in the file README.cma, included with Freeciv.\
+preset examples in the file README.governor, included with Freeciv.\
 ")
 
 [help_chatline]


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32827 - in /branches/S2_6: client/gui-xaw/cma_fe.c data/helpdata.txt

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:25:14 2016
New Revision: 32827

URL: http://svn.gna.org/viewcvs/freeciv?rev=32827&view=rev
Log:
Corrected mentions of README.cma to refer to README.governor instead.

Additional instances of the problem reported by Jacob Nevins 

See bug #24650

Modified:
branches/S2_6/client/gui-xaw/cma_fe.c
branches/S2_6/data/helpdata.txt

Modified: branches/S2_6/client/gui-xaw/cma_fe.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/cma_fe.c?rev=32827&r1=32826&r2=32827&view=diff
==
--- branches/S2_6/client/gui-xaw/cma_fe.c   (original)
+++ branches/S2_6/client/gui-xaw/cma_fe.c   Sat Jun 11 14:25:14 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2003 - The Freeciv Project 
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -81,9 +81,9 @@
 struct city *current_city;
 char *initial_preset_list[] = {
N_("For information on\n"
-   "the citizen governor and governor presets,\n"
-   "including sample presets,\n"
-   "see README.cma."),
+   "the citizen governor and governor presets,\n"
+   "including sample presets,\n"
+   "see README.governor."),
NULL};
 
 

Modified: branches/S2_6/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=32827&r1=32826&r2=32827&view=diff
==
--- branches/S2_6/data/helpdata.txt (original)
+++ branches/S2_6/data/helpdata.txt Sat Jun 11 14:25:14 2016
@@ -1792,7 +1792,7 @@
 encounter some difficulties with managing cities nearby, by hand. \
 It's best to manage all cities on an island either by hand or by \
 governor. Read more hints, some background information, and some \
-preset examples in the file README.cma, included with Freeciv.\
+preset examples in the file README.governor, included with Freeciv.\
 ")
 
 [help_chatline]


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32824 - /trunk/common/tile.h

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:11:00 2016
New Revision: 32824

URL: http://svn.gna.org/viewcvs/freeciv?rev=32824&view=rev
Log:
Removed unnecessary NULL check from tile_extras()

See patch #7183

Modified:
trunk/common/tile.h

Modified: trunk/common/tile.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/tile.h?rev=32824&r1=32823&r2=32824&view=diff
==
--- trunk/common/tile.h (original)
+++ trunk/common/tile.h Sat Jun 11 14:11:00 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -114,11 +114,6 @@
 const bv_extras *tile_extras_null(void);
 static inline const bv_extras *tile_extras(const struct tile *ptile)
 {
-  /* With this NULL check this function is actually same as tile_extras_safe().
-   * We may remove the check later when callers that need _safe(), do so. */
-  if (ptile == NULL) {
-return tile_extras_null();
-  }
   return &(ptile->extras);
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32825 - /branches/S2_6/common/tile.h

[cazfi74]

Author: cazfi
Date: Sat Jun 11 14:11:07 2016
New Revision: 32825

URL: http://svn.gna.org/viewcvs/freeciv?rev=32825&view=rev
Log:
Removed unnecessary NULL check from tile_extras()

See patch #7183

Modified:
branches/S2_6/common/tile.h

Modified: branches/S2_6/common/tile.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/tile.h?rev=32825&r1=32824&r2=32825&view=diff
==
--- branches/S2_6/common/tile.h (original)
+++ branches/S2_6/common/tile.h Sat Jun 11 14:11:07 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -112,11 +112,6 @@
 const bv_extras *tile_extras_null(void);
 static inline const bv_extras *tile_extras(const struct tile *ptile)
 {
-  /* With this NULL check this function is actually same as tile_extras_safe().
-   * We may remove the check later when callers that need _safe(), do so. */
-  if (ptile == NULL) {
-return tile_extras_null();
-  }
   return &(ptile->extras);
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32747 - in /branches/S2_5/common: unittype.c unittype.h

[cazfi74]

Author: cazfi
Date: Wed May 18 20:07:31 2016
New Revision: 32747

URL: http://svn.gna.org/viewcvs/freeciv?rev=32747&view=rev
Log:
Inlined utype_has_flag() and uclass_has_flag()

See patch #7189

Modified:
branches/S2_5/common/unittype.c
branches/S2_5/common/unittype.h

Modified: branches/S2_5/common/unittype.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unittype.c?rev=32747&r1=32746&r2=32747&view=diff
==
--- branches/S2_5/common/unittype.c (original)
+++ branches/S2_5/common/unittype.c Wed May 18 20:07:31 2016
@@ -173,25 +173,6 @@
 }
 
 /**
-  Return whether the given unit class has the flag.
-**/
-bool uclass_has_flag(const struct unit_class *punitclass,
- enum unit_class_flag_id flag)
-{
-  fc_assert_ret_val(unit_class_flag_id_is_valid(flag), FALSE);
-  return BV_ISSET(punitclass->flags, flag);
-}
-
-/**
-  Return whether the given unit type has the flag.
-**/
-bool utype_has_flag(const struct unit_type *punittype, int flag)
-{
-  fc_assert_ret_val(unit_type_flag_id_is_valid(flag), FALSE);
-  return BV_ISSET(punittype->flags, flag);
-}
-
-/**
   Return whether the unit has the given flag.
 **/
 bool unit_has_type_flag(const struct unit *punit, enum unit_type_flag_id flag)

Modified: branches/S2_5/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unittype.h?rev=32747&r1=32746&r2=32747&view=diff
==
--- branches/S2_5/common/unittype.h (original)
+++ branches/S2_5/common/unittype.h Wed May 18 20:07:31 2016
@@ -499,7 +499,14 @@
 
 /* General unit type flag and role routines */
 bool unit_has_type_flag(const struct unit *punit, enum unit_type_flag_id flag);
-bool utype_has_flag(const struct unit_type *punittype, int flag);
+
+/**
+  Return whether the given unit type has the flag.
+**/
+static inline bool utype_has_flag(const struct unit_type *punittype, int flag)
+{
+  return BV_ISSET(punittype->flags, flag);
+}
 
 bool unit_has_type_role(const struct unit *punit, enum unit_role_id role);
 bool utype_has_role(const struct unit_type *punittype, int role);
@@ -555,8 +562,14 @@
 const char *uclass_rule_name(const struct unit_class *pclass);
 const char *uclass_name_translation(const struct unit_class *pclass);
 
-bool uclass_has_flag(const struct unit_class *punitclass,
- enum unit_class_flag_id flag);
+/**
+  Return whether the given unit class has the flag.
+**/
+static inline bool uclass_has_flag(const struct unit_class *punitclass,
+   enum unit_class_flag_id flag)
+{
+  return BV_ISSET(punitclass->flags, flag);
+}
 
 /* Ancillary routines */
 int unit_build_shield_cost(const struct unit *punit);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32746 - in /trunk/win32: Makefile.am installer_msys2/Makefile installer_msys2/freeciv-mp-gtk3x.cmd

[cazfi74]

Author: cazfi
Date: Wed May 18 19:23:48 2016
New Revision: 32746

URL: http://svn.gna.org/viewcvs/freeciv?rev=32746&view=rev
Log:
Add gtk3x modpack installer files to msys2 gtk3x-client installer package

See patch #7228

Added:
trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd
Modified:
trunk/win32/Makefile.am
trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/Makefile.am?rev=32746&r1=32745&r2=32746&view=diff
==
--- trunk/win32/Makefile.am (original)
+++ trunk/win32/Makefile.am Wed May 18 19:23:48 2016
@@ -38,6 +38,7 @@
installer_msys2/freeciv-gtk3x.cmd   \
installer_msys2/freeciv-mp-gtk2.cmd \
installer_msys2/freeciv-mp-gtk3.cmd \
+   installer_msys2/freeciv-mp-gtk3x.cmd\
installer_msys2/freeciv-mp-qt.cmd   \
installer_msys2/freeciv-qt.cmd  \
installer_msys2/freeciv-sdl2.cmd\

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32746&r1=32745&r2=32746&view=diff
==
--- trunk/win32/installer_msys2/Makefile(original)
+++ trunk/win32/installer_msys2/MakefileWed May 18 19:23:48 2016
@@ -33,7 +33,7 @@
 all: gtk3-installer gtk2-installer sdl2-installer qt-installer 
ruledit-installer
 
 gtk3x-installer:
-   make GUI=gtk3x FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-gtk3x
+   make GUI=gtk3x FCMP=gtk3x EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-gtk3x
 
 # These are what can be built in current official environment version
 buildable-win32: gtk3-installer gtk3x-installer

Added: trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd?rev=32746&view=auto
==
--- trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd(added)
+++ trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmdWed May 18 19:23:48 2016
@@ -0,0 +1,3 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+start freeciv-mp-gtk3x.exe %2 %3 %4 %5 %6 %7 %8 %9


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32744 - /trunk/win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Wed May 18 01:01:02 2016
New Revision: 32744

URL: http://svn.gna.org/viewcvs/freeciv?rev=32744&view=rev
Log:
Include adwaita icon theme to msys2 based Windows Installer packages

See patch #7230

Modified:
trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32744&r1=32743&r2=32744&view=diff
==
--- trunk/win32/installer_msys2/Makefile(original)
+++ trunk/win32/installer_msys2/MakefileWed May 18 01:01:02 2016
@@ -244,6 +244,8 @@
# add additional GTK+3 files
mkdir -p install-$(WINARCH)-$(GUI)/etc
cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
+   mkdir -p install-$(WINARCH)-$(GUI)/share/icons
+   cp -R $(ARCHDIR)/share/icons/Adwaita 
install-$(WINARCH)-$(GUI)/share/icons/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32745 - /branches/S2_6/win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Wed May 18 01:01:10 2016
New Revision: 32745

URL: http://svn.gna.org/viewcvs/freeciv?rev=32745&view=rev
Log:
Include adwaita icon theme to msys2 based Windows Installer packages

See patch #7230

Modified:
branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=32745&r1=32744&r2=32745&view=diff
==
--- branches/S2_6/win32/installer_msys2/Makefile(original)
+++ branches/S2_6/win32/installer_msys2/MakefileWed May 18 01:01:10 2016
@@ -232,6 +232,8 @@
# add additional GTK+3 files
mkdir -p install-$(WINARCH)-$(GUI)/etc
cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
+   mkdir -p install-$(WINARCH)-$(GUI)/share/icons
+   cp -R $(ARCHDIR)/share/icons/Adwaita 
install-$(WINARCH)-$(GUI)/share/icons/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32743 - /branches/S2_6/doc/README.msys2

[cazfi74]

Author: cazfi
Date: Tue May 17 23:28:06 2016
New Revision: 32743

URL: http://svn.gna.org/viewcvs/freeciv?rev=32743&view=rev
Log:
Corrected name of package mingw-w64-i686-sqlite3 in README.msys2

See patch #7229

Modified:
branches/S2_6/doc/README.msys2

Modified: branches/S2_6/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=32743&r1=32742&r2=32743&view=diff
==
--- branches/S2_6/doc/README.msys2  (original)
+++ branches/S2_6/doc/README.msys2  Tue May 17 23:28:06 2016
@@ -138,7 +138,7 @@
 - autoconf
 - python
 - mingw-w64-i686-icu
-- mingw-w64-i686-libsqlite
+- mingw-w64-i686-sqlite3
 - mingw-w64-i686-gtk3
 - mingw-w64-i686-nsis
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32742 - /trunk/doc/README.msys2

[cazfi74]

Author: cazfi
Date: Tue May 17 23:28:02 2016
New Revision: 32742

URL: http://svn.gna.org/viewcvs/freeciv?rev=32742&view=rev
Log:
Corrected name of package mingw-w64-i686-sqlite3 in README.msys2

See patch #7229

Modified:
trunk/doc/README.msys2

Modified: trunk/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=32742&r1=32741&r2=32742&view=diff
==
--- trunk/doc/README.msys2  (original)
+++ trunk/doc/README.msys2  Tue May 17 23:28:02 2016
@@ -142,7 +142,7 @@
 - autoconf
 - python
 - mingw-w64-i686-icu
-- mingw-w64-i686-libsqlite
+- mingw-w64-i686-sqlite3
 - mingw-w64-i686-gtk3
 - mingw-w64-i686-nsis
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32739 - /trunk/tools/civmanual.c

[cazfi74]

Author: cazfi
Date: Tue May 17 23:20:09 2016
New Revision: 32739

URL: http://svn.gna.org/viewcvs/freeciv?rev=32739&view=rev
Log:
Replaced log_error() call in freeciv-modpack commandline parameter with 
fc_fprintf(stderr ...)
since logging is not initialized yet at that point.

See bug #24637

Modified:
trunk/tools/civmanual.c

Modified: trunk/tools/civmanual.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/civmanual.c?rev=32739&r1=32738&r2=32739&view=diff
==
--- trunk/tools/civmanual.c (original)
+++ trunk/tools/civmanual.c Tue May 17 23:20:09 2016
@@ -608,7 +608,7 @@
   while (inx < argc) {
 if ((option = get_option_malloc("--ruleset", argv, &inx, argc))) {
   if (ruleset != NULL) {
-log_error(_("Multiple rulesets requested. Only one ruleset at time 
supported"));
+fc_fprintf(stderr, _("Multiple rulesets requested. Only one ruleset at 
time supported.\n"));
 free(option);
   } else {
 ruleset = option;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32741 - /branches/S2_5/tools/civmanual.c

[cazfi74]

Author: cazfi
Date: Tue May 17 23:20:19 2016
New Revision: 32741

URL: http://svn.gna.org/viewcvs/freeciv?rev=32741&view=rev
Log:
Replaced log_error() call in freeciv-modpack commandline parameter with 
fc_fprintf(stderr ...)
since logging is not initialized yet at that point.

See bug #24637

Modified:
branches/S2_5/tools/civmanual.c

Modified: branches/S2_5/tools/civmanual.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/civmanual.c?rev=32741&r1=32740&r2=32741&view=diff
==
--- branches/S2_5/tools/civmanual.c (original)
+++ branches/S2_5/tools/civmanual.c Tue May 17 23:20:19 2016
@@ -510,7 +510,7 @@
   while (inx < argc) {
 if ((option = get_option_malloc("--ruleset", argv, &inx, argc))) {
   if (ruleset != NULL) {
-log_error(_("Multiple rulesets requested. Only one ruleset at time 
supported"));
+fc_fprintf(stderr, _("Multiple rulesets requested. Only one ruleset at 
time supported.\n"));
 free(option);
   } else {
 ruleset = option;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32740 - /branches/S2_6/tools/civmanual.c

[cazfi74]

Author: cazfi
Date: Tue May 17 23:20:14 2016
New Revision: 32740

URL: http://svn.gna.org/viewcvs/freeciv?rev=32740&view=rev
Log:
Replaced log_error() call in freeciv-modpack commandline parameter with 
fc_fprintf(stderr ...)
since logging is not initialized yet at that point.

See bug #24637

Modified:
branches/S2_6/tools/civmanual.c

Modified: branches/S2_6/tools/civmanual.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/civmanual.c?rev=32740&r1=32739&r2=32740&view=diff
==
--- branches/S2_6/tools/civmanual.c (original)
+++ branches/S2_6/tools/civmanual.c Tue May 17 23:20:14 2016
@@ -565,7 +565,7 @@
   while (inx < argc) {
 if ((option = get_option_malloc("--ruleset", argv, &inx, argc))) {
   if (ruleset != NULL) {
-log_error(_("Multiple rulesets requested. Only one ruleset at time 
supported"));
+fc_fprintf(stderr, _("Multiple rulesets requested. Only one ruleset at 
time supported.\n"));
 free(option);
   } else {
 ruleset = option;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32737 - /branches/S2_6/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Tue May 17 22:25:45 2016
New Revision: 32737

URL: http://svn.gna.org/viewcvs/freeciv?rev=32737&view=rev
Log:
Mention 'minplayers' setting in "not enought human players" -message

See patch #7119

Modified:
branches/S2_6/server/stdinhand.c

Modified: branches/S2_6/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/stdinhand.c?rev=32737&r1=32736&r2=32737&view=diff
==
--- branches/S2_6/server/stdinhand.c(original)
+++ branches/S2_6/server/stdinhand.cTue May 17 22:25:45 2016
@@ -5666,8 +5666,12 @@
  * players have died */
 if (game.info.is_new_game
 && human_players < game.server.min_players) {
-  start_cmd_reply(caller, notify,
-  _("Not enough human players; game will not start."));
+  char buf[512] = "";
+
+  fc_snprintf(buf, sizeof(buf),
+  _("Not enough human players ('minplayers' server setting has 
value %d); game will not start."),
+  game.server.min_players);
+  start_cmd_reply(caller, notify, buf);
   return FALSE;
 } else if (player_count() < 1) {
   /* At least one player required */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32738 - /branches/S2_5/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Tue May 17 22:25:50 2016
New Revision: 32738

URL: http://svn.gna.org/viewcvs/freeciv?rev=32738&view=rev
Log:
Mention 'minplayers' setting in "not enought human players" -message

See patch #7119

Modified:
branches/S2_5/server/stdinhand.c

Modified: branches/S2_5/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/stdinhand.c?rev=32738&r1=32737&r2=32738&view=diff
==
--- branches/S2_5/server/stdinhand.c(original)
+++ branches/S2_5/server/stdinhand.cTue May 17 22:25:50 2016
@@ -5670,8 +5670,12 @@
  * players have died */
 if (game.info.is_new_game
 && human_players < game.server.min_players) {
-  start_cmd_reply(caller, notify,
-  _("Not enough human players; game will not start."));
+  char buf[512] = "";
+
+  fc_snprintf(buf, sizeof(buf),
+  _("Not enough human players ('minplayers' server setting has 
value %d); game will not start."),
+  game.server.min_players);
+  start_cmd_reply(caller, notify, buf);
   return FALSE;
 } else if (player_count() < 1) {
   /* At least one player required */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32736 - /trunk/server/stdinhand.c

[cazfi74]

Author: cazfi
Date: Tue May 17 22:25:39 2016
New Revision: 32736

URL: http://svn.gna.org/viewcvs/freeciv?rev=32736&view=rev
Log:
Mention 'minplayers' setting in "not enought human players" -message

See patch #7119

Modified:
trunk/server/stdinhand.c

Modified: trunk/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/stdinhand.c?rev=32736&r1=32735&r2=32736&view=diff
==
--- trunk/server/stdinhand.c(original)
+++ trunk/server/stdinhand.cTue May 17 22:25:39 2016
@@ -5673,8 +5673,12 @@
  * players have died */
 if (game.info.is_new_game
 && human_players < game.server.min_players) {
-  start_cmd_reply(caller, notify,
-  _("Not enough human players; game will not start."));
+  char buf[512] = "";
+
+  fc_snprintf(buf, sizeof(buf),
+  _("Not enough human players ('minplayers' server setting has 
value %d); game will not start."),
+  game.server.min_players);
+  start_cmd_reply(caller, notify, buf);
   return FALSE;
 } else if (player_count() < 1) {
   /* At least one player required */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32735 - in /trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0: gtk.css menubar.css

[cazfi74]

Author: cazfi
Date: Tue May 17 20:52:12 2016
New Revision: 32735

URL: http://svn.gna.org/viewcvs/freeciv?rev=32735&view=rev
Log:
Replaced trivially replaceable deprecated pseudo-classes from gtk3x-client theme
with their modern counterparts.

See patch #7218

Modified:
trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/gtk.css
trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/menubar.css

Modified: trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/gtk.css
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/gtk.css?rev=32735&r1=32734&r2=32735&view=diff
==
--- trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/gtk.css   (original)
+++ trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/gtk.css   Tue May 17 
20:52:12 2016
@@ -54,7 +54,7 @@
   background-color: #e7d6b0;
 }
 
-:insensitive {
+:disabled {
   color: #9d9d9d;
   /* background-color: #FF; */
   /* background-color: #626262; */
@@ -107,7 +107,7 @@
   border-image-repeat: stretch;
 }
 
-.button:insensitive {
+.button:disabled {
   border-width: 3px;
   border-image-source: url("Buttons/button-insensitive.png");
   border-image-repeat: stretch;
@@ -119,50 +119,50 @@
 .button:backdrop,
 .button:focus,
 .button:focus:active,
-.button:insensitive,
-.button:prelight {
+.button:disabled,
+.button:hover {
   background-image: none;
   background-color: #e7d6b0;
 }
 
 .check,
 .check row:selected,
-.check row:selected:focused {
+.check row:selected:focus {
   background-image: url("Check-Radio/check1.png");
   background-size: cover;
 }
 
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focused:insensitive {
+.check:disabled,
+.check row:selected:disabled,
+.check row:selected:focus:disabled {
   background-image: url("Check-Radio/check3.png");
   background-size: cover;
 }
 
 .check:active,
 .check row:selected:active,
-.check row:selected:focused:active {
+.check row:selected:focus:active {
   background-image: url("Check-Radio/check4.png");
   background-size: cover;
 }
 
 .radio,
 .radio row:selected,
-.radio row:selected:focused {
+.radio row:selected:focus {
   background-image: url("Check-Radio/option1.png");
   background-size: cover;
 }
 
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focused:insensitive {
+.radio:disabled,
+.radio row:selected:disabled,
+.radio row:selected:focus:disabled {
   background-image: url("Check-Radio/option3.png");
   background-size: cover;
 }
 
 .radio:active,
 .radio row:selected:active,
-.radio row:selected:focused:active {
+.radio row:selected:focus:active {
   background-image: url("Check-Radio/option4.png");
   background-size: cover;
 }
@@ -240,7 +240,7 @@
   background-clip: border-box;
 }
 
-column-header .button:insensitive {
+column-header .button:disabled {
   background-image: url("ListHeaders/list_header-insens.png");
   background-size: cover;
   background-clip: border-box;

Modified: trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/menubar.css
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/menubar.css?rev=32735&r1=32734&r2=32735&view=diff
==
--- trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/menubar.css   (original)
+++ trunk/data/themes/gui-gtk-3.x/Freeciv/gtk-3.0/menubar.css   Tue May 17 
20:52:12 2016
@@ -20,8 +20,8 @@
   color : #404040;
 }
 
-.menubar:insensitive,
-.menubar:insensitive *
+.menubar:disabled,
+.menubar:disabled *
 {
   color : #b2b2b2;
 }


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32731 - /branches/S2_5/autogen.sh

[cazfi74]

Author: cazfi
Date: Tue May 17 00:53:15 2016
New Revision: 32731

URL: http://svn.gna.org/viewcvs/freeciv?rev=32731&view=rev
Log:
Fixed autogen.sh tool version detection when the terminal does not support some
characters that full output of --version gives, but the version number is not
affected.

See bug #24636

Modified:
branches/S2_5/autogen.sh

Modified: branches/S2_5/autogen.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/autogen.sh?rev=32731&r1=32730&r2=32731&view=diff
==
--- branches/S2_5/autogen.sh(original)
+++ branches/S2_5/autogen.shTue May 17 00:53:15 2016
@@ -178,7 +178,7 @@
   }
 
   # The following line is carefully crafted sed magic
-  pkg_version=`$PACKAGE --version 2>&1|grep -v " line " |head -n 1|sed 
's/([^)]*)//g;s/^[a-zA-Z\.\ \-]*//;s/ .*$//'`
+  pkg_version=`$PACKAGE --version 2>&1|grep -a -v " line " |head -n 1|sed 
's/([^)]*)//g;s/^[a-zA-Z\.\ \-]*//;s/ .*$//'`
   debug "pkg_version $pkg_version"
   pkg_major=`echo $pkg_version | cut -d. -f1`
   pkg_minor=`echo $pkg_version | sed s/[-,a-z,A-Z].*// | cut -d. -f2`


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32730 - in /branches/S2_5/common: road.c road.h tile.c tile.h

[cazfi74]

Author: cazfi
Date: Tue May 17 00:51:23 2016
New Revision: 32730

URL: http://svn.gna.org/viewcvs/freeciv?rev=32730&view=rev
Log:
Inlined some of the most often called short functions that were not yet inlined.

See patch #7202

Modified:
branches/S2_5/common/road.c
branches/S2_5/common/road.h
branches/S2_5/common/tile.c
branches/S2_5/common/tile.h

Modified: branches/S2_5/common/road.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/road.c?rev=32730&r1=32729&r2=32730&view=diff
==
--- branches/S2_5/common/road.c (original)
+++ branches/S2_5/common/road.c Tue May 17 00:51:23 2016
@@ -177,15 +177,6 @@
   } road_type_iterate_end;
 
   return NULL;
-}
-
-/
-  Is road native to unit class?
-/
-bool is_native_road_to_uclass(const struct road_type *proad,
-  const struct unit_class *pclass)
-{
-  return BV_ISSET(proad->native_to, uclass_index(pclass));
 }
 
 /

Modified: branches/S2_5/common/road.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/road.h?rev=32730&r1=32729&r2=32730&view=diff
==
--- branches/S2_5/common/road.h (original)
+++ branches/S2_5/common/road.h Tue May 17 00:51:23 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -130,8 +130,11 @@
 
 bool road_has_flag(const struct road_type *proad, enum road_flag_id flag);
 
-bool is_native_road_to_uclass(const struct road_type *proad,
-  const struct unit_class *pclass);
+static inline bool is_native_road_to_uclass(const struct road_type *proad,
+const struct unit_class *pclass)
+{
+  return BV_ISSET(proad->native_to, uclass_index(pclass));
+}
 
 bool road_can_be_built(const struct road_type *proad, const struct tile 
*ptile);
 bool can_build_road(const struct road_type *proad,

Modified: branches/S2_5/common/tile.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/tile.c?rev=32730&r1=32729&r2=32730&view=diff
==
--- branches/S2_5/common/tile.c (original)
+++ branches/S2_5/common/tile.c Tue May 17 00:51:23 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -894,14 +894,6 @@
 }
 
 /
-  Returns TRUE if the given tile has a road of given type on it.
-/
-bool tile_has_road(const struct tile *ptile, const struct road_type *proad)
-{
-  return BV_ISSET(ptile->roads, road_index(proad));
-}
-
-/
   Tile has any river type
 /
 bool tile_has_river(const struct tile *ptile)

Modified: branches/S2_5/common/tile.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/tile.h?rev=32730&r1=32729&r2=32730&view=diff
==
--- branches/S2_5/common/tile.h (original)
+++ branches/S2_5/common/tile.h Tue May 17 00:51:23 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -141,7 +141,15 @@
 int tile_extras_class_defense_bonus(const struct tile *ptile,
 const struct unit_class *pclass);
 
-bool tile_has_road(const struct tile *ptile, const struct road_type *proad);
+/
+  Returns TRUE if the given tile has a road of given type on it.
+/
+static inline bool tile_has_

[Freeciv-commits] r32729 - in /branches/S2_5/common/aicore: aisupport.h caravan.h citymap.h cm.h path_finding.h pf_tools.h

[cazfi74]

Author: cazfi
Date: Mon May 16 20:33:12 2016
New Revision: 32729

URL: http://svn.gna.org/viewcvs/freeciv?rev=32729&view=rev
Log:
Added extern "C" for C++ compilations in headers under aicore/

See bug #24669

Modified:
branches/S2_5/common/aicore/aisupport.h
branches/S2_5/common/aicore/caravan.h
branches/S2_5/common/aicore/citymap.h
branches/S2_5/common/aicore/cm.h
branches/S2_5/common/aicore/path_finding.h
branches/S2_5/common/aicore/pf_tools.h

Modified: branches/S2_5/common/aicore/aisupport.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/aicore/aisupport.h?rev=32729&r1=32728&r2=32729&view=diff
==
--- branches/S2_5/common/aicore/aisupport.h (original)
+++ branches/S2_5/common/aicore/aisupport.h Mon May 16 20:33:12 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,10 +13,21 @@
 #ifndef FC__AISUPPORT_H
 #define FC__AISUPPORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* common */
 #include "fc_types.h"
+
 
 struct player *player_leading_spacerace(void);
 int player_distance_to_player(struct player *pplayer, struct player *target);
 int city_gold_worth(struct city *pcity);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* FC__AISUPPORT_H */

Modified: branches/S2_5/common/aicore/caravan.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/aicore/caravan.h?rev=32729&r1=32728&r2=32729&view=diff
==
--- branches/S2_5/common/aicore/caravan.h   (original)
+++ branches/S2_5/common/aicore/caravan.h   Mon May 16 20:33:12 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -12,6 +12,11 @@
 ***/
 #ifndef FC__CARAVAN_H
 #define FC__CARAVAN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* utility */
 #include "log.h"/* enum log_level */
@@ -127,7 +132,7 @@
   }
 
 void caravan_result_init_zero(struct caravan_result *result);
-int caravan_result_compare(const struct caravan_result *a, 
+int caravan_result_compare(const struct caravan_result *a,
const struct caravan_result *b);
 
 void caravan_evaluate(const struct unit *caravan, const struct city *dest,
@@ -142,4 +147,8 @@
const struct caravan_parameter *parameter,
struct caravan_result *result);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+  
+#endif /* FC__CARAVAN_H */

Modified: branches/S2_5/common/aicore/citymap.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/aicore/citymap.h?rev=32729&r1=32728&r2=32729&view=diff
==
--- branches/S2_5/common/aicore/citymap.h   (original)
+++ branches/S2_5/common/aicore/citymap.h   Mon May 16 20:33:12 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - Per I. Mathisen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,9 +13,16 @@
 #ifndef FC__CITYMAP_H
 #define FC__CITYMAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* utility */
+#include "support.h" /* bool type */
+
+/* common */
 #include "fc_types.h"
-
-#include "support.h"/* bool type */
 
 void citymap_turn_init(struct player *pplayer);
 void citymap_reserve_city_spot(struct tile *ptile, int id);
@@ -26,4 +33,8 @@
 
 void citymap_free(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* FC__CITYMAP_H */

Modified: branches/S2_5/common/aicore/cm.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/aicore/cm.h?rev=32729&r1=32728&r2=32729&view=diff
==
--- branches/S2_5/common/aicore/cm.h(original)
+++ branches/S2_5/common/aicore/cm.hMon May 16 20:33:12 2016
@@ -1,4 +1,4 @@
-/** 
+/*

[Freeciv-commits] r32728 - in /branches/S2_6/common/aicore: aisupport.h caravan.h citymap.h cm.h path_finding.h pf_tools.h

[cazfi74]

Author: cazfi
Date: Mon May 16 20:33:04 2016
New Revision: 32728

URL: http://svn.gna.org/viewcvs/freeciv?rev=32728&view=rev
Log:
Added extern "C" for C++ compilations in headers under aicore/

See bug #24669

Modified:
branches/S2_6/common/aicore/aisupport.h
branches/S2_6/common/aicore/caravan.h
branches/S2_6/common/aicore/citymap.h
branches/S2_6/common/aicore/cm.h
branches/S2_6/common/aicore/path_finding.h
branches/S2_6/common/aicore/pf_tools.h

Modified: branches/S2_6/common/aicore/aisupport.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/aicore/aisupport.h?rev=32728&r1=32727&r2=32728&view=diff
==
--- branches/S2_6/common/aicore/aisupport.h (original)
+++ branches/S2_6/common/aicore/aisupport.h Mon May 16 20:33:04 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,10 +13,21 @@
 #ifndef FC__AISUPPORT_H
 #define FC__AISUPPORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* common */
 #include "fc_types.h"
+
 
 struct player *player_leading_spacerace(void);
 int player_distance_to_player(struct player *pplayer, struct player *target);
 int city_gold_worth(struct city *pcity);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* FC__AISUPPORT_H */

Modified: branches/S2_6/common/aicore/caravan.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/aicore/caravan.h?rev=32728&r1=32727&r2=32728&view=diff
==
--- branches/S2_6/common/aicore/caravan.h   (original)
+++ branches/S2_6/common/aicore/caravan.h   Mon May 16 20:33:04 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -12,6 +12,11 @@
 ***/
 #ifndef FC__CARAVAN_H
 #define FC__CARAVAN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* utility */
 #include "log.h"/* enum log_level */
@@ -135,7 +140,7 @@
   }
 
 void caravan_result_init_zero(struct caravan_result *result);
-int caravan_result_compare(const struct caravan_result *a, 
+int caravan_result_compare(const struct caravan_result *a,
const struct caravan_result *b);
 
 void caravan_evaluate(const struct unit *caravan, const struct city *dest,
@@ -150,4 +155,8 @@
const struct caravan_parameter *parameter,
struct caravan_result *result, bool omniscient);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* FC__CARAVAN_H */

Modified: branches/S2_6/common/aicore/citymap.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/aicore/citymap.h?rev=32728&r1=32727&r2=32728&view=diff
==
--- branches/S2_6/common/aicore/citymap.h   (original)
+++ branches/S2_6/common/aicore/citymap.h   Mon May 16 20:33:04 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - Per I. Mathisen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,9 +13,16 @@
 #ifndef FC__CITYMAP_H
 #define FC__CITYMAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* utility */
+#include "support.h" /* bool type */
+
+/* common */
 #include "fc_types.h"
-
-#include "support.h"/* bool type */
 
 void citymap_turn_init(struct player *pplayer);
 void citymap_reserve_city_spot(struct tile *ptile, int id);
@@ -26,4 +33,8 @@
 
 void citymap_free(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* FC__CITYMAP_H */

Modified: branches/S2_6/common/aicore/cm.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/aicore/cm.h?rev=32728&r1=32727&r2=32728&view=diff
==
--- branches/S2_6/common/aicore/cm.h(original)
+++ branches/S2_6/common/aicore/cm.hMon May 16 20:33:04 2016
@@ -1,4 +1,4 @@
-/** 
+/**

[Freeciv-commits] r32727 - in /trunk/common/aicore: aisupport.h caravan.h citymap.h cm.h path_finding.h pf_tools.h

[cazfi74]

Author: cazfi
Date: Mon May 16 20:32:55 2016
New Revision: 32727

URL: http://svn.gna.org/viewcvs/freeciv?rev=32727&view=rev
Log:
Added extern "C" for C++ compilations in headers under aicore/

See bug #24669

Modified:
trunk/common/aicore/aisupport.h
trunk/common/aicore/caravan.h
trunk/common/aicore/citymap.h
trunk/common/aicore/cm.h
trunk/common/aicore/path_finding.h
trunk/common/aicore/pf_tools.h

Modified: trunk/common/aicore/aisupport.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/aisupport.h?rev=32727&r1=32726&r2=32727&view=diff
==
--- trunk/common/aicore/aisupport.h (original)
+++ trunk/common/aicore/aisupport.h Mon May 16 20:32:55 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,10 +13,21 @@
 #ifndef FC__AISUPPORT_H
 #define FC__AISUPPORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* common */
 #include "fc_types.h"
+
 
 struct player *player_leading_spacerace(void);
 int player_distance_to_player(struct player *pplayer, struct player *target);
 int city_gold_worth(struct city *pcity);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* FC__AISUPPORT_H */

Modified: trunk/common/aicore/caravan.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/caravan.h?rev=32727&r1=32726&r2=32727&view=diff
==
--- trunk/common/aicore/caravan.h   (original)
+++ trunk/common/aicore/caravan.h   Mon May 16 20:32:55 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -12,6 +12,11 @@
 ***/
 #ifndef FC__CARAVAN_H
 #define FC__CARAVAN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* utility */
 #include "log.h"/* enum log_level */
@@ -135,7 +140,7 @@
   }
 
 void caravan_result_init_zero(struct caravan_result *result);
-int caravan_result_compare(const struct caravan_result *a, 
+int caravan_result_compare(const struct caravan_result *a,
const struct caravan_result *b);
 
 void caravan_evaluate(const struct unit *caravan, const struct city *dest,
@@ -150,4 +155,8 @@
const struct caravan_parameter *parameter,
struct caravan_result *result, bool omniscient);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* FC__CARAVAN_H */

Modified: trunk/common/aicore/citymap.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/citymap.h?rev=32727&r1=32726&r2=32727&view=diff
==
--- trunk/common/aicore/citymap.h   (original)
+++ trunk/common/aicore/citymap.h   Mon May 16 20:32:55 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 2003 - Per I. Mathisen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,9 +13,16 @@
 #ifndef FC__CITYMAP_H
 #define FC__CITYMAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* utility */
+#include "support.h" /* bool type */
+
+/* common */
 #include "fc_types.h"
-
-#include "support.h"/* bool type */
 
 void citymap_turn_init(struct player *pplayer);
 void citymap_reserve_city_spot(struct tile *ptile, int id);
@@ -26,4 +33,8 @@
 
 void citymap_free(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* FC__CITYMAP_H */

Modified: trunk/common/aicore/cm.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/cm.h?rev=32727&r1=32726&r2=32727&view=diff
==
--- trunk/common/aicore/cm.h(original)
+++ trunk/common/aicore/cm.hMon May 16 20:32:55 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2002 - The Freeciv Project
This program is free software; you can redistribute it and/or mod

[Freeciv-commits] r32726 - in /branches/S2_5/client: gui-gtk-3.0/mapctrl.c gui-qt/mapctrl.cpp gui-stub/mapctrl.c gui-xaw/mapctrl.c

[cazfi74]

Author: cazfi
Date: Mon May 16 16:47:19 2016
New Revision: 32726

URL: http://svn.gna.org/viewcvs/freeciv?rev=32726&view=rev
Log:
Corrected placement for variable declaration in gtk3-client 
create_line_at_mouse_pos()

See patch #7206

Modified:
branches/S2_5/client/gui-gtk-3.0/mapctrl.c
branches/S2_5/client/gui-qt/mapctrl.cpp
branches/S2_5/client/gui-stub/mapctrl.c
branches/S2_5/client/gui-xaw/mapctrl.c

Modified: branches/S2_5/client/gui-gtk-3.0/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/mapctrl.c?rev=32726&r1=32725&r2=32726&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/mapctrl.c  (original)
+++ branches/S2_5/client/gui-gtk-3.0/mapctrl.c  Mon May 16 16:47:19 2016
@@ -352,14 +352,16 @@
 void create_line_at_mouse_pos(void)
 {
   int x, y;
+  GdkWindow *window;
   GdkDeviceManager *manager =
   gdk_display_get_device_manager(gtk_widget_get_display(toplevel));
   GdkDevice *pointer = gdk_device_manager_get_client_pointer(manager);
+
   if (!pointer) {
 return;
   }
 
-  GdkWindow *window = gdk_device_get_window_at_position(pointer, &x, &y);
+  window = gdk_device_get_window_at_position(pointer, &x, &y);
   if (window) {
 if (window == gtk_widget_get_window(map_canvas)) {
   update_line(x, y);

Modified: branches/S2_5/client/gui-qt/mapctrl.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/mapctrl.cpp?rev=32726&r1=32725&r2=32726&view=diff
==
--- branches/S2_5/client/gui-qt/mapctrl.cpp (original)
+++ branches/S2_5/client/gui-qt/mapctrl.cpp Mon May 16 16:47:19 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@
 {
   QPoint global_pos, local_pos;
   int x, y;
+
   global_pos = QCursor::pos();
   local_pos = gui()->mapview_wdg->mapFromGlobal(global_pos);
   x = local_pos.x();

Modified: branches/S2_5/client/gui-stub/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-stub/mapctrl.c?rev=32726&r1=32725&r2=32726&view=diff
==
--- branches/S2_5/client/gui-stub/mapctrl.c (original)
+++ branches/S2_5/client/gui-stub/mapctrl.c Mon May 16 16:47:19 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

Modified: branches/S2_5/client/gui-xaw/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-xaw/mapctrl.c?rev=32726&r1=32725&r2=32726&view=diff
==
--- branches/S2_5/client/gui-xaw/mapctrl.c  (original)
+++ branches/S2_5/client/gui-xaw/mapctrl.c  Mon May 16 16:47:19 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -222,7 +222,7 @@
 }
 
 /**
-...
+  Update goto line so that destination is at current mouse pointer location.
 **/
 void create_line_at_mouse_pos(void)
 {
@@ -233,10 +233,10 @@
 
   on_same_screen =
 XQueryPointer(display, XtWindow(map_canvas),
- &root, &child,
- &rx, &ry,
- &x, &y,
- &mask);
+  &root, &child,
+  &rx, &ry,
+  &x, &y,
+  &mask);
 
   if (on_same_screen) {
 update_line(x, y);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32725 - /branches/S2_6/win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Mon May 16 14:56:04 2016
New Revision: 32725

URL: http://svn.gna.org/viewcvs/freeciv?rev=32725&view=rev
Log:
Enabled NLS on msys2 builds

See patch #6985

Modified:
branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=32725&r1=32724&r2=32725&view=diff
==
--- branches/S2_6/win32/installer_msys2/Makefile(original)
+++ branches/S2_6/win32/installer_msys2/MakefileMon May 16 14:56:04 2016
@@ -70,7 +70,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
-   cd build-$(WINARCH)-$(GUI); ../../../configure 
FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--enable-client=$(GUI) --with-followtag="win32-S2_6" --without-readline 
--disable-sdl-mixer --disable-nls --without-libbz2 --enable-fcmp=$(FCMP) 
$(EXTRA_CONFIG)
+   cd build-$(WINARCH)-$(GUI); ../../../configure 
FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--enable-client=$(GUI) --with-followtag="win32-S2_6" --without-readline 
--disable-sdl-mixer --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po
@@ -104,6 +104,7 @@
mv install-$(WINARCH)-$(GUI)/usr/local/etc install-$(WINARCH)-$(GUI)/
mv install-$(WINARCH)-$(GUI)/usr/local/share/freeciv 
install-$(WINARCH)-$(GUI)/data
mkdir -p install-$(WINARCH)-$(GUI)/share
+   mv install-$(WINARCH)-$(GUI)/usr/local/share/locale 
install-$(WINARCH)-$(GUI)/share/
mv install-$(WINARCH)-$(GUI)/usr/local/share/doc 
install-$(WINARCH)-$(GUI)/doc
mkdir -p install-$(WINARCH)-$(GUI)/debuginfo
cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h 
install-$(WINARCH)-$(GUI)/debuginfo
@@ -233,6 +234,8 @@
cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk30.mo -delete
 
 install-env-gtk3: install-env-default-fcmp
 
@@ -248,6 +251,8 @@
cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk20.mo -delete
 
 SDL2_DLLS := \
libpng12-0.dll \
@@ -279,6 +284,8 @@
cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)
# add additional Qt files
cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -delete
 
 # TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and
 #   COMMON_MSYS_DLLS with most obviously unnecessary things left out.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32724 - /trunk/win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Mon May 16 14:55:56 2016
New Revision: 32724

URL: http://svn.gna.org/viewcvs/freeciv?rev=32724&view=rev
Log:
Enabled NLS on msys2 builds

See patch #6985

Modified:
trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32724&r1=32723&r2=32724&view=diff
==
--- trunk/win32/installer_msys2/Makefile(original)
+++ trunk/win32/installer_msys2/MakefileMon May 16 14:55:56 2016
@@ -73,7 +73,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
-   cd build-$(WINARCH)-$(GUI); ../../../configure 
FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline 
--disable-sdl-mixer --disable-nls --without-libbz2 --enable-fcmp=$(FCMP) 
$(EXTRA_CONFIG)
+   cd build-$(WINARCH)-$(GUI); ../../../configure 
FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline 
--disable-sdl-mixer --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -109,6 +109,7 @@
mv install-$(WINARCH)-$(GUI)/usr/local/etc install-$(WINARCH)-$(GUI)/
mv install-$(WINARCH)-$(GUI)/usr/local/share/freeciv 
install-$(WINARCH)-$(GUI)/data
mkdir -p install-$(WINARCH)-$(GUI)/share
+   mv install-$(WINARCH)-$(GUI)/usr/local/share/locale 
install-$(WINARCH)-$(GUI)/share/
mv install-$(WINARCH)-$(GUI)/usr/local/share/doc 
install-$(WINARCH)-$(GUI)/doc
mkdir -p install-$(WINARCH)-$(GUI)/debuginfo
cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h 
install-$(WINARCH)-$(GUI)/debuginfo
@@ -245,6 +246,8 @@
cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk30.mo -delete
 
 install-env-gtk3x: install-env-default-fcmp
 
@@ -262,6 +265,8 @@
cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk20.mo -delete
 
 SDL2_DLLS := \
libpng12-0.dll \
@@ -293,6 +298,8 @@
cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)
# add additional Qt files
cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/
+   cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+   find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -delete
 
 # TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and
 #   COMMON_MSYS_DLLS with most obviously unnecessary things left out.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32721 - in /trunk: ai/default/ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.x/ client/gui-qt/ client/gu...

[cazfi74]

Author: cazfi
Date: Mon May 16 06:01:23 2016
New Revision: 32721

URL: http://svn.gna.org/viewcvs/freeciv?rev=32721&view=rev
Log:
Pass city production as pointer to most functions

See patch #7226

Modified:
trunk/ai/default/aiunit.c
trunk/ai/default/daidomestic.c
trunk/client/citydlg_common.c
trunk/client/citydlg_common.h
trunk/client/climisc.c
trunk/client/climisc.h
trunk/client/global_worklist.c
trunk/client/gui-gtk-2.0/citydlg.c
trunk/client/gui-gtk-2.0/cityrep.c
trunk/client/gui-gtk-2.0/wldlg.c
trunk/client/gui-gtk-3.0/citydlg.c
trunk/client/gui-gtk-3.0/cityrep.c
trunk/client/gui-gtk-3.0/wldlg.c
trunk/client/gui-gtk-3.x/citydlg.c
trunk/client/gui-gtk-3.x/cityrep.c
trunk/client/gui-gtk-3.x/wldlg.c
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/cityrep.cpp
trunk/client/gui-qt/cityrep.h
trunk/client/gui-sdl2/wldlg.c
trunk/client/mapctrl_common.c
trunk/common/aicore/caravan.c
trunk/common/city.c
trunk/common/city.h
trunk/common/networking/dataio_raw.c
trunk/common/worklist.c
trunk/common/worklist.h
trunk/server/advisors/advbuilding.c
trunk/server/cityhand.c
trunk/server/citytools.c
trunk/server/citytools.h
trunk/server/cityturn.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/ai/default/aiunit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiunit.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daidomestic.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/citydlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/citydlg_common.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/citydlg_common.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/citydlg_common.h?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/climisc.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/climisc.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/climisc.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/climisc.h?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/global_worklist.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/global_worklist.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/citydlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-2.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/cityrep.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-2.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/wldlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/cityrep.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/wldlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.x/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/citydlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.x/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/cityrep.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-gtk-3.x/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/wldlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-qt/cityrep.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/cityrep.cpp?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-qt/cityrep.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/cityrep.h?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/gui-sdl2/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/wldlg.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/client/mapctrl_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/mapctrl_common.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/common/aicore/caravan.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/caravan.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/common/city.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/city.c?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/common/city.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/city.h?rev=32721&r1=32720&r2=32721&view=diff

Modified: trunk/common/netw

[Freeciv-commits] r32722 - in /branches/S2_6: ai/default/ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-qt/ client/gui-sdl/ clien...

[cazfi74]

Author: cazfi
Date: Mon May 16 06:01:33 2016
New Revision: 32722

URL: http://svn.gna.org/viewcvs/freeciv?rev=32722&view=rev
Log:
Pass city production as pointer to most functions

See patch #7226

Modified:
branches/S2_6/ai/default/aiunit.c
branches/S2_6/ai/default/daidomestic.c
branches/S2_6/client/citydlg_common.c
branches/S2_6/client/citydlg_common.h
branches/S2_6/client/climisc.c
branches/S2_6/client/climisc.h
branches/S2_6/client/global_worklist.c
branches/S2_6/client/gui-gtk-2.0/citydlg.c
branches/S2_6/client/gui-gtk-2.0/cityrep.c
branches/S2_6/client/gui-gtk-2.0/wldlg.c
branches/S2_6/client/gui-gtk-3.0/citydlg.c
branches/S2_6/client/gui-gtk-3.0/cityrep.c
branches/S2_6/client/gui-gtk-3.0/wldlg.c
branches/S2_6/client/gui-qt/citydlg.cpp
branches/S2_6/client/gui-qt/cityrep.cpp
branches/S2_6/client/gui-qt/cityrep.h
branches/S2_6/client/gui-sdl/wldlg.c
branches/S2_6/client/gui-sdl2/wldlg.c
branches/S2_6/client/gui-xaw/citydlg.c
branches/S2_6/client/gui-xaw/cityrep.c
branches/S2_6/client/gui-xaw/wldlg.c
branches/S2_6/client/mapctrl_common.c
branches/S2_6/common/aicore/caravan.c
branches/S2_6/common/city.c
branches/S2_6/common/city.h
branches/S2_6/common/dataio.c
branches/S2_6/common/requirements.c
branches/S2_6/common/requirements.h
branches/S2_6/common/worklist.c
branches/S2_6/common/worklist.h
branches/S2_6/server/advisors/advbuilding.c
branches/S2_6/server/cityhand.c
branches/S2_6/server/citytools.c
branches/S2_6/server/citytools.h
branches/S2_6/server/cityturn.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/ai/default/aiunit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aiunit.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daidomestic.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/citydlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/citydlg_common.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/citydlg_common.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/citydlg_common.h?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/climisc.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/climisc.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/climisc.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/climisc.h?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/global_worklist.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/global_worklist.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/citydlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/cityrep.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/wldlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/cityrep.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/wldlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-qt/cityrep.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/cityrep.cpp?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-qt/cityrep.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/cityrep.h?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-sdl/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/wldlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-sdl2/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/wldlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-xaw/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/citydlg.c?rev=32722&r1=32721&r2=32722&view=diff

Modified: branches/S2_6/client/gui-xaw/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/clien

[Freeciv-commits] r32719 - in /branches/S2_5/client/gui-gtk-3.0: editgui.c editgui.h gui_main.c

[cazfi74]

Author: cazfi
Date: Sun May 15 14:10:50 2016
New Revision: 32719

URL: http://svn.gna.org/viewcvs/freeciv?rev=32719&view=rev
Log:
Free gtk3-client editbar icons on exit

See bug #24634

Modified:
branches/S2_5/client/gui-gtk-3.0/editgui.c
branches/S2_5/client/gui-gtk-3.0/editgui.h
branches/S2_5/client/gui-gtk-3.0/gui_main.c

Modified: branches/S2_5/client/gui-gtk-3.0/editgui.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editgui.c?rev=32719&r1=32718&r2=32719&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/editgui.c  (original)
+++ branches/S2_5/client/gui-gtk-3.0/editgui.c  Sun May 15 14:10:50 2016
@@ -825,6 +825,19 @@
 }
 
 /
+  Clears all stores from the editbar.
+/
+static void clear_tool_stores(struct editbar *eb)
+{
+  clear_tool_store(eb->tool_selectors[ETT_TERRAIN]->store);
+  clear_tool_store(eb->tool_selectors[ETT_TERRAIN_RESOURCE]->store);
+  clear_tool_store(eb->tool_selectors[ETT_TERRAIN_SPECIAL]->store);
+  clear_tool_store(eb->tool_selectors[ETT_ROAD]->store);
+  clear_tool_store(eb->tool_selectors[ETT_MILITARY_BASE]->store);
+  clear_tool_store(eb->tool_selectors[ETT_UNIT]->store);
+}
+
+/
   Reload all tool value data from the tileset for the given toolbar.
 /
 static void editbar_reload_tileset(struct editbar *eb)
@@ -839,11 +852,12 @@
 return;
   }
 
+  clear_tool_stores(eb);
+
   /* Reload terrains. */
 
   tvs = eb->tool_selectors[ETT_TERRAIN];
   store = tvs->store;
-  clear_tool_store(store);
 
   terrain_type_iterate(pterrain) {
 gtk_list_store_append(store, &iter);
@@ -863,7 +877,6 @@
 
   tvs = eb->tool_selectors[ETT_TERRAIN_RESOURCE];
   store = tvs->store;
-  clear_tool_store(store);
 
   resource_type_iterate(presource) {
 gtk_list_store_append(store, &iter);
@@ -889,7 +902,6 @@
 
   tvs = eb->tool_selectors[ETT_TERRAIN_SPECIAL];
   store = tvs->store;
-  clear_tool_store(store);
 
   tile_special_type_iterate(special) {
 gtk_list_store_append(store, &iter);
@@ -912,7 +924,6 @@
 
   tvs = eb->tool_selectors[ETT_ROAD];
   store = tvs->store;
-  clear_tool_store(store);
 
   road_type_iterate(proad) {
 int id;
@@ -935,7 +946,6 @@
 
   tvs = eb->tool_selectors[ETT_MILITARY_BASE];
   store = tvs->store;
-  clear_tool_store(store);
 
   base_type_iterate(pbase) {
 int id;
@@ -959,7 +969,6 @@
 
   tvs = eb->tool_selectors[ETT_UNIT];
   store = tvs->store;
-  clear_tool_store(store);
 
   unit_type_iterate(putype) {
 gtk_list_store_append(store, &iter);
@@ -1929,6 +1938,16 @@
 }
 
 /
+  Free everything allocated for the editgui.
+/
+void editgui_free(void)
+{
+  struct editbar *eb = editgui_get_editbar();
+
+  clear_tool_stores(eb);
+}
+
+/
   Return a pointer to the editor info box embedded in the client's GUI.
 /
 struct editinfobox *editgui_get_editinfobox(void)

Modified: branches/S2_5/client/gui-gtk-3.0/editgui.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editgui.h?rev=32719&r1=32718&r2=32719&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/editgui.h  (original)
+++ branches/S2_5/client/gui-gtk-3.0/editgui.h  Sun May 15 14:10:50 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -61,6 +61,7 @@
 };
 
 void editgui_create_widgets(void);
+void editgui_free(void);
 struct editbar *editgui_get_editbar(void);
 struct editinfobox *editgui_get_editinfobox(void);
 

Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=32719&r1=32718&r2=32719&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Sun May 15 14:10:50 2016
@@ -1791,6 +1791,7 @@
   diplomacy_dialog_done();
   cma_fe_done();
   free_unit_table();
+  editgui_free();
   gtk_widget_destroy(toplevel_tabs);
   message_buffer = NULL; /* Result of 

[Freeciv-commits] r32718 - /branches/S2_6/ai/default/aiunit.c

[cazfi74]

Author: cazfi
Date: Sun May 15 10:09:05 2016
New Revision: 32718

URL: http://svn.gna.org/viewcvs/freeciv?rev=32718&view=rev
Log:
Set allow_foreign_trade to 'FTL_NATIONAL_ONLY', not boolean FALSE,

See patch #7225

Modified:
branches/S2_6/ai/default/aiunit.c

Modified: branches/S2_6/ai/default/aiunit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aiunit.c?rev=32718&r1=32717&r2=32718&view=diff
==
--- branches/S2_6/ai/default/aiunit.c   (original)
+++ branches/S2_6/ai/default/aiunit.c   Sun May 15 10:09:05 2016
@@ -2256,7 +2256,7 @@
   parameter.ignore_transit_time = TRUE;
 }
 if (tired_of_waiting_boat) {
-  parameter.allow_foreign_trade = FALSE;
+  parameter.allow_foreign_trade = FTL_NATIONAL_ONLY;
   parameter.ignore_transit_time = FALSE;
 }
 caravan_find_best_destination(punit, ¶meter, &result, 
!has_handicap(pplayer, H_MAP));


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32717 - /trunk/ai/default/aiunit.c

[cazfi74]

Author: cazfi
Date: Sun May 15 10:09:01 2016
New Revision: 32717

URL: http://svn.gna.org/viewcvs/freeciv?rev=32717&view=rev
Log:
Set allow_foreign_trade to 'FTL_NATIONAL_ONLY', not boolean FALSE,

See patch #7225

Modified:
trunk/ai/default/aiunit.c

Modified: trunk/ai/default/aiunit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiunit.c?rev=32717&r1=32716&r2=32717&view=diff
==
--- trunk/ai/default/aiunit.c   (original)
+++ trunk/ai/default/aiunit.c   Sun May 15 10:09:01 2016
@@ -2260,7 +2260,7 @@
   parameter.ignore_transit_time = TRUE;
 }
 if (tired_of_waiting_boat) {
-  parameter.allow_foreign_trade = FALSE;
+  parameter.allow_foreign_trade = FTL_NATIONAL_ONLY;
   parameter.ignore_transit_time = FALSE;
 }
 caravan_find_best_destination(punit, ¶meter, &result, 
!has_handicap(pplayer, H_MAP));


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32715 - in /trunk/win32: installer/ installer_msys2/

[cazfi74]

Author: cazfi
Date: Sun May 15 09:58:49 2016
New Revision: 32715

URL: http://svn.gna.org/viewcvs/freeciv?rev=32715&view=rev
Log:
Updated Windows Installer package creation to match rename of the freeciv 
translation
domain as freeciv-core.

Also corrected one place in ruledit installer package creation that was 
referring to
freeciv translation domain instead of ruledit's own.

See bug #24666

Modified:
trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh
trunk/win32/installer/create-freeciv-ruledit-nsi.sh
trunk/win32/installer/create-freeciv-sdl2-nsi.sh
trunk/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
trunk/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
trunk/win32/installer_msys2/create-freeciv-sdl2-nsi.sh

Modified: trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh?rev=32715&r1=32714&r2=32715&view=diff
==
--- trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh  (original)
+++ trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh  Sun May 15 09:58:49 2016
@@ -167,7 +167,7 @@
 
 EOF
 
-cat ../../bootstrap/langstat_freeciv.txt |
+cat ../../bootstrap/langstat_core.txt |
 sort -k 2 |
 while read -r code prct name
 do
@@ -227,7 +227,7 @@
   \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)"
 EOF
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_core.txt |
   sort -k 2 |
   while read -r code prct name
   do
@@ -251,7 +251,7 @@
   echo "StrCpy \$DefaultLanguageCode \"en_US\""
   echo "  \${EndIf}"
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_core.txt |
   while read -r code prct name
   do
 echo "  \${If} \$LangName == \"$name ($code) $prct\""

Modified: trunk/win32/installer/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/create-freeciv-ruledit-nsi.sh?rev=32715&r1=32714&r2=32715&view=diff
==
--- trunk/win32/installer/create-freeciv-ruledit-nsi.sh (original)
+++ trunk/win32/installer/create-freeciv-ruledit-nsi.sh Sun May 15 09:58:49 2016
@@ -250,7 +250,7 @@
   echo "StrCpy \$DefaultLanguageCode \"en_US\""
   echo "  \${EndIf}"
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_ruledit.txt |
   while read -r code prct name
   do
 echo "  \${If} \$LangName == \"$name ($code) $prct\""

Modified: trunk/win32/installer/create-freeciv-sdl2-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/create-freeciv-sdl2-nsi.sh?rev=32715&r1=32714&r2=32715&view=diff
==
--- trunk/win32/installer/create-freeciv-sdl2-nsi.sh(original)
+++ trunk/win32/installer/create-freeciv-sdl2-nsi.shSun May 15 09:58:49 2016
@@ -167,7 +167,7 @@
 
 EOF
 
-cat ../../bootstrap/langstat_freeciv.txt |
+cat ../../bootstrap/langstat_core.txt |
 sort -k 2 |
 while read -r code prct name
 do
@@ -245,7 +245,7 @@
   \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)"
 EOF
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_core.txt |
   sort -k 2 |
   while read -r code prct name
   do
@@ -269,7 +269,7 @@
   echo "StrCpy \$DefaultLanguageCode \"en_US\""
   echo "  \${EndIf}"
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_core.txt |
   while read -r code prct name
   do
 echo "  \${If} \$LangName == \"$name ($code) $prct\""

Modified: trunk/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh?rev=32715&r1=32714&r2=32715&view=diff
==
--- trunk/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh(original)
+++ trunk/win32/installer_msys2/create-freeciv-gtk-qt-nsi.shSun May 15 
09:58:49 2016
@@ -168,11 +168,11 @@
 
 EOF
 
-cat ../../bootstrap/langstat_freeciv.txt |
+cat ../../bootstrap/langstat_core.txt |
 sort -k 2 |
 while read -r code prct name
 do
-if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
+if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
 echo "  Section \"$name ($code) $prct\""
 echo "  SetOutPath \$INSTDIR\\share\\locale\\$code"
 echo "  File /r $1\\share\\locale\\$code\*.*"
@@ -228,11 +228,11 @@
   \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)"
 EOF
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_core.txt |
   sort -k 2 |
   while read -r code prct name
   do
-  if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
+  if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
   echo "  \${NSD_CB_AddString} \$DefaultLanguageDropList \"$name ($code) 

[Freeciv-commits] r32716 - in /branches/S2_6/win32: installer/create-freeciv-ruledit-nsi.sh installer_msys2/create-freeciv-ruledit-nsi.sh

[cazfi74]

Author: cazfi
Date: Sun May 15 09:59:19 2016
New Revision: 32716

URL: http://svn.gna.org/viewcvs/freeciv?rev=32716&view=rev
Log:
Corrected one place in Windows Ruledit Installer package creation that was 
referring to
freeciv translation domain instead of ruledit's own.

See bug #24666

Modified:
branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh
branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh

Modified: branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh?rev=32716&r1=32715&r2=32716&view=diff
==
--- branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh (original)
+++ branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh Sun May 15 
09:59:19 2016
@@ -250,7 +250,7 @@
   echo "StrCpy \$DefaultLanguageCode \"en_US\""
   echo "  \${EndIf}"
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_ruledit.txt |
   while read -r code prct name
   do
 echo "  \${If} \$LangName == \"$name ($code) $prct\""

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh?rev=32716&r1=32715&r2=32716&view=diff
==
--- branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   Sun May 
15 09:59:19 2016
@@ -251,7 +251,7 @@
   echo "StrCpy \$DefaultLanguageCode \"en_US\""
   echo "  \${EndIf}"
 
-  cat ../../bootstrap/langstat_freeciv.txt |
+  cat ../../bootstrap/langstat_ruledit.txt |
   while read -r code prct name
   do
 echo "  \${If} \$LangName == \"$name ($code) $prct\""


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32714 - /trunk/server/maphand.c

[cazfi74]

Author: cazfi
Date: Sun May 15 09:16:05 2016
New Revision: 32714

URL: http://svn.gna.org/viewcvs/freeciv?rev=32714&view=rev
Log:
When borders change owners and border vision is controlled by effects, adjust
vision of the one losing the borders based on his/her own effect value.

See bug #24313

Modified:
trunk/server/maphand.c

Modified: trunk/server/maphand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/maphand.c?rev=32714&r1=32713&r2=32714&view=diff
==
--- trunk/server/maphand.c  (original)
+++ trunk/server/maphand.c  Sun May 15 09:16:05 2016
@@ -1913,21 +1913,22 @@
 {
   struct player *ploser = tile_owner(ptile);
 
-  if (BORDERS_SEE_INSIDE == game.info.borders
-  || BORDERS_EXPAND == game.info.borders
-  || (powner && powner->server.border_vision)) {
-if (ploser != powner) {
-  if (ploser) {
-const v_radius_t radius_sq = V_RADIUS(-1, 0);
-
-shared_vision_change_seen(ploser, ptile, radius_sq, FALSE);
-  }
-  if (powner) {
-const v_radius_t radius_sq = V_RADIUS(1, 0);
-
-shared_vision_change_seen(powner, ptile, radius_sq, TRUE);
-  }
-}
+  if ((ploser != powner && ploser != NULL)
+  && (BORDERS_SEE_INSIDE == game.info.borders
+  || BORDERS_EXPAND == game.info.borders
+  || ploser->server.border_vision)) {
+const v_radius_t radius_sq = V_RADIUS(-1, 0);
+
+shared_vision_change_seen(ploser, ptile, radius_sq, FALSE);
+  }
+
+  if (powner != NULL
+  && (BORDERS_SEE_INSIDE == game.info.borders
+  || BORDERS_EXPAND == game.info.borders
+  || powner->server.border_vision)) {
+const v_radius_t radius_sq = V_RADIUS(1, 0);
+
+shared_vision_change_seen(powner, ptile, radius_sq, TRUE);
   }
 
   tile_set_owner(ptile, powner, psource);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32713 - /branches/S2_6/data/sandbox/game.ruleset

[cazfi74]

Author: cazfi
Date: Sun May 15 01:02:32 2016
New Revision: 32713

URL: http://svn.gna.org/viewcvs/freeciv?rev=32713&view=rev
Log:
Fixed locking of 'barbarians' server setting in sandbox ruleset.

See bug #24648

Modified:
branches/S2_6/data/sandbox/game.ruleset

Modified: branches/S2_6/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/game.ruleset?rev=32713&r1=32712&r2=32713&view=diff
==
--- branches/S2_6/data/sandbox/game.ruleset (original)
+++ branches/S2_6/data/sandbox/game.ruleset Sun May 15 01:02:32 2016
@@ -709,7 +709,7 @@
 ; freeciv game settings for sandbox ruleset
 ;
 set =
-{ "name", "value", "locked"
+{ "name", "value", "lock"
   ; For forward compatibility reasons, we don't want Pirate nation to ever 
get created
   ; to the savegames.
   "barbarians", "DISABLED", TRUE


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32712 - in /branches/S2_5/common: map.c unittype.c unittype.h

[cazfi74]

Author: cazfi
Date: Sat May 14 21:18:29 2016
New Revision: 32712

URL: http://svn.gna.org/viewcvs/freeciv?rev=32712&view=rev
Log:
Added list of roads providing movement bonus to the unit class caches.

See patch #7176

Modified:
branches/S2_5/common/map.c
branches/S2_5/common/unittype.c
branches/S2_5/common/unittype.h

Modified: branches/S2_5/common/map.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/map.c?rev=32712&r1=32711&r2=32712&view=diff
==
--- branches/S2_5/common/map.c  (original)
+++ branches/S2_5/common/map.c  Sat May 14 21:18:29 2016
@@ -793,53 +793,50 @@
* check. We want to give railroad bonus only to native units. */
   ri = restrict_infra(pplayer, t1, t2);
 
-  road_type_iterate(proad) {
-if (proad->move_mode != RMM_NO_BONUS
-&& (!ri || road_has_flag(proad, RF_UNRESTRICTED_INFRA))) {
-  if ((!pclass || is_native_road_to_uclass(proad, pclass))
-  && tile_has_road(t1, proad) && tile_has_road(t2, proad)) {
-if (cost > proad->move_cost) {
-
-  if (proad->move_mode == RMM_FAST_ALWAYS) {
+  road_type_list_iterate(pclass->cache.bonus_roads, proad) {
+if ((!ri || road_has_flag(proad, RF_UNRESTRICTED_INFRA))
+&& tile_has_road(t1, proad) && tile_has_road(t2, proad)) {
+  if (cost > proad->move_cost) {
+
+if (proad->move_mode == RMM_FAST_ALWAYS) {
+  cost = proad->move_cost;
+} else {
+  if (!cardinality_checked) {
+cardinal_move = (ALL_DIRECTIONS_CARDINAL() || is_move_cardinal(t1, 
t2));
+cardinality_checked = TRUE;
+  }
+  if (cardinal_move) {
 cost = proad->move_cost;
   } else {
-if (!cardinality_checked) {
-  cardinal_move = (ALL_DIRECTIONS_CARDINAL() || 
is_move_cardinal(t1, t2));
-  cardinality_checked = TRUE;
-}
-if (cardinal_move) {
+switch (proad->move_mode) {
+case RMM_CARDINAL:
+  break;
+case RMM_RELAXED:
+  if (cost > proad->move_cost * 2) {
+cardinal_between_iterate(t1, t2, between) {
+  if (tile_has_road(between, proad)) {
+/* TODO: Should we restrict this more?
+ * Should we check against enemy cities on between tile?
+ * Should we check against non-native terrain on between 
tile?
+ */
+cost = proad->move_cost * 2;
+  }
+} cardinal_between_iterate_end;
+  }
+  break;
+case RMM_FAST_ALWAYS:
+  fc_assert(proad->move_mode != RMM_FAST_ALWAYS); /* Already 
handled above */
   cost = proad->move_cost;
-} else {
-  switch (proad->move_mode) {
-  case RMM_CARDINAL:
-break;
-  case RMM_RELAXED:
-if (cost > proad->move_cost * 2) {
-  cardinal_between_iterate(t1, t2, between) {
-if (tile_has_road(between, proad)) {
-  /* TODO: Should we restrict this more?
-   * Should we check against enemy cities on between tile?
-   * Should we check against non-native terrain on between 
tile?
-   */
-  cost = proad->move_cost * 2;
-}
-  } cardinal_between_iterate_end;
-}
-break;
-  case RMM_FAST_ALWAYS:
-fc_assert(proad->move_mode != RMM_FAST_ALWAYS); /* Already 
handled above */
-cost = proad->move_cost;
-break;
-  case RMM_NO_BONUS:
-fc_assert(proad->move_mode != RMM_NO_BONUS);
-break;
-  }
+  break;
+case RMM_NO_BONUS:
+  fc_assert(proad->move_mode != RMM_NO_BONUS);
+  break;
 }
   }
 }
   }
 }
-  } road_type_iterate_end;
+  } road_type_list_iterate_end;
 
   if (punit && unit_has_type_flag(punit, UTYF_IGTER)) {
 return MIN(cost, MOVE_COST_IGTER);

Modified: branches/S2_5/common/unittype.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unittype.c?rev=32712&r1=32711&r2=32712&view=diff
==
--- branches/S2_5/common/unittype.c (original)
+++ branches/S2_5/common/unittype.c Sat May 14 21:18:29 2016
@@ -1149,6 +1149,7 @@
 unit_classes[i].cache.refuel_bases = NULL;
 unit_classes[i].cache.native_tile_bases = NULL;
 unit_classes[i].cache.native_tile_roads = NULL;
+unit_classes[i].cache.bonus_roads = NULL;
   }
 }
 
@@ -1171,6 +1172,10 @@
 if (unit_classes[i].cache.native_tile_roads != NULL) {
   road_type_list_destroy(unit_clas

[Freeciv-commits] r32711 - /branches/S2_5/fc_version

[cazfi74]

Author: cazfi
Date: Sat May 14 17:07:07 2016
New Revision: 32711

URL: http://svn.gna.org/viewcvs/freeciv?rev=32711&view=rev
Log:
Allow builder to force freeciv version label to use.

See patch #7196

Modified:
branches/S2_5/fc_version

Modified: branches/S2_5/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=32711&r1=32710&r2=32711&view=diff
==
--- branches/S2_5/fc_version(original)
+++ branches/S2_5/fc_versionSat May 14 17:07:07 2016
@@ -59,6 +59,10 @@
 
 FREECIV_DISTRIBUTOR=""
 
+if test "x$FREECIV_LABEL_FORCE" != "x" ; then
+  VERSION_LABEL=$(echo $FREECIV_LABEL_FORCE | sed "s//$VERSION_LABEL/g")
+fi
+
 if test x$VERSION_REVTYPE = xsvn && which svn > /dev/null ; then
   VERSION_REV="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 
's/^Revision: //')"
 elif test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32710 - in /branches/S2_5/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c

[cazfi74]

Author: cazfi
Date: Sat May 14 16:55:59 2016
New Revision: 32710

URL: http://svn.gna.org/viewcvs/freeciv?rev=32710&view=rev
Log:
Disconnect gtk-clients cleanly from the server even when Quitting client,
instead of just Leaving game.

See bug #24629

Modified:
branches/S2_5/client/gui-gtk-2.0/gui_main.c
branches/S2_5/client/gui-gtk-3.0/gui_main.c

Modified: branches/S2_5/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/gui_main.c?rev=32710&r1=32709&r2=32710&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/gui_main.c Sat May 14 16:55:59 2016
@@ -1,4 +1,4 @@
-/** 
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2056,6 +2056,9 @@
 {
   gtk_widget_destroy(dialog);
   if (response == GTK_RESPONSE_YES) {
+if (client.conn.used) {
+  disconnect_from_server();
+}
 quit_gtk_main();
   }
 }

Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=32710&r1=32709&r2=32710&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Sat May 14 16:55:59 2016
@@ -1,4 +1,4 @@
-/**
+/***
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2102,6 +2102,9 @@
 {
   gtk_widget_destroy(dialog);
   if (response == GTK_RESPONSE_YES) {
+if (client.conn.used) {
+  disconnect_from_server();
+}
 quit_gtk_main();
   }
 }


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32709 - in /trunk: configure.ac utility/shared.c

[cazfi74]

Author: cazfi
Date: Sat May 14 16:15:38 2016
New Revision: 32709

URL: http://svn.gna.org/viewcvs/freeciv?rev=32709&view=rev
Log:
Added configure test for setenv() availability and fallback to putenv() when 
it's not
available.

See bug #24658

Modified:
trunk/configure.ac
trunk/utility/shared.c

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32709&r1=32708&r2=32709&view=diff
==
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Sat May 14 16:15:38 2016
@@ -1356,7 +1356,7 @@
getpwuid inet_aton select snooze strcasestr \
strerror strlcat strlcpy strstr uname usleep \
 getline _strcoll stricoll _stricoll strcasecoll \
-backtrace])
+backtrace setenv putenv])
 
 AC_MSG_CHECKING(for working gettimeofday)
   FC_CHECK_GETTIMEOFDAY_RUNTIME(,AC_DEFINE([HAVE_GETTIMEOFDAY], [1],

Modified: trunk/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=32709&r1=32708&r2=32709&view=diff
==
--- trunk/utility/shared.c  (original)
+++ trunk/utility/shared.c  Sat May 14 16:15:38 2016
@@ -1589,7 +1589,16 @@
 void switch_lang(const char *lang)
 {
 #ifdef FREECIV_ENABLE_NLS
+#ifdef HAVE_SETENV
   setenv("LANG", lang, TRUE);
+#else  /* HAVE_SETENV */
+  if (lang != NULL) {
+static char envstr[40];
+
+fc_snprintf(envstr, sizeof(envstr), "LANG=%s", lang);
+putenv(envstr);
+  }
+#endif /* HAVE_SETENV */
 
   (void) setlocale(LC_ALL, "");
   (void) bindtextdomain("freeciv-core", get_locale_dir());


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32698 - /branches/S2_6/server/settings.c

[cazfi74]

Author: cazfi
Date: Sat May 14 08:44:00 2016
New Revision: 32698

URL: http://svn.gna.org/viewcvs/freeciv?rev=32698&view=rev
Log:
Do not claim in server setting 'revolen' help that the value means number of 
turns, as
the exact meaning depends on 'revolentype'

See bug #24656

Modified:
branches/S2_6/server/settings.c

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=32698&r1=32697&r2=32698&view=diff
==
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Sat May 14 08:44:00 2016
@@ -2170,7 +2170,7 @@
 
   GEN_INT("revolen", game.server.revolution_length,
   SSET_RULES_FLEXIBLE, SSET_SOCIOLOGY, SSET_RARE, SSET_TO_CLIENT,
-  N_("Length in turns of revolution"),
+  N_("Length of revolution"),
   N_("When changing governments, a period of anarchy will occur. "
  "Value of this setting, used the way 'revolentype' setting "
  "dictates, defines the length of the anarchy."),


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32697 - /trunk/server/settings.c

[cazfi74]

Author: cazfi
Date: Sat May 14 08:43:51 2016
New Revision: 32697

URL: http://svn.gna.org/viewcvs/freeciv?rev=32697&view=rev
Log:
Do not claim in server setting 'revolen' help that the value means number of 
turns, as
the exact meaning depends on 'revolentype'

See bug #24656

Modified:
trunk/server/settings.c

Modified: trunk/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=32697&r1=32696&r2=32697&view=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Sat May 14 08:43:51 2016
@@ -2217,7 +2217,7 @@
   GEN_INT("revolen", game.server.revolution_length,
   SSET_RULES_FLEXIBLE, SSET_SOCIOLOGY, SSET_RARE,
   ALLOW_NONE, ALLOW_BASIC,
-  N_("Length in turns of revolution"),
+  N_("Length of revolution"),
   N_("When changing governments, a period of anarchy will occur. "
  "Value of this setting, used the way 'revolentype' setting "
  "dictates, defines the length of the anarchy."),


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r32696 - in /trunk: configure.ac tools/Makefile.am tools/mpgui_gtk3.c

[cazfi74]

Author: cazfi
Date: Sat May 14 08:13:05 2016
New Revision: 32696

URL: http://svn.gna.org/viewcvs/freeciv?rev=32696&view=rev
Log:
Allow one to select gtk3x gui also to modpack installer.

See patch #7220

Modified:
trunk/configure.ac
trunk/tools/Makefile.am
trunk/tools/mpgui_gtk3.c

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32696&r1=32695&r2=32696&view=diff
==
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Sat May 14 08:13:05 2016
@@ -995,13 +995,14 @@
 
 dnl freeciv-modpack checks
 AC_ARG_ENABLE([fcmp],
-  AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/qt/cli/all/auto], [build 
freeciv-modpack-program [auto]]),
+  AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/gtk3x/qt/cli/all/auto], 
[build freeciv-modpack-program [auto]]),
 [fc_mp=${enableval}],
 [fc_mp=auto])
 
 fcmp_cli=no
 fcmp_gtk2=no
 fcmp_gtk3=no
+fcmp_gtk3x=no
 fcmp_qt=no
 fcmp_list=
 
@@ -1027,6 +1028,8 @@
  test "x$mp" = "xgtk30"  ||
  test "x$mp" = "xgtk-3.0" ; then
   req_fcmp_gtk3=yes
+elif test "x$mp" = "xgtk3x" ; then
+  req_fcmp_gtk3x=yes
 elif test "x$mp" = "xqt" ; then
   req_fcmp_qt=yes
 elif test "x$mp" = "xcli" ; then
@@ -1065,6 +1068,34 @@
   AC_MSG_ERROR([Cannot build gtk3-version of freeciv-modpack as requested])
 fi
 
+if test "x$req_fcmp_gtk3x" = "xyes" ||
+   test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then
+  PKG_CHECK_MODULES([GTK3X_MP], [gtk+-3.0 >= 3.18.0],
+[
+  GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18"
+  GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46"
+  PKG_CHECK_MODULES([GTHREAD_GTK3X], [gthread-2.0],
+[
+  fcmp_gtk3x=yes
+  fcmp_list="$fcmp_list gtk3x"
+  mp_gtk3x_cflags="$GTK3X_MP_CFLAGS $GHTREAD_GTK3X_CFLAGS"
+  mp_gtk3x_libs="$GTK3X_MP_LIBS $GTHREAD_GTK3X_LIBS"
+  if test "x$MINGW32" = "xyes"; then
+dnl Required to compile gtk3 on Windows platform
+mp_gtk3x_cflags="$mp_gtk3x_cflags -mms-bitfields"
+mp_gtk3x_ldflags="$mp_gtk3x_ldflags -mwindows"
+  fi
+
+  if test "x$modinst" = "xauto" ; then
+modinst=found
+  fi
+], [])], [])
+fi
+
+if test "x$req_fcmp_gtk3x" = "xyes" && test "x$fcmp_gtk3x" != "xyes" ; then
+  AC_MSG_ERROR([Cannot build gtk3x-version of freeciv-modpack as requested])
+fi
+
 if test "x$req_fcmp_gtk2" = "xyes" ||
test "x$modinst" = "xall" ; then
   AM_PATH_GTK_2_0([2.12.0],
@@ -1127,6 +1158,7 @@
test "x$modinst" != "xno" &&
test "x$modinst" != "xcli" &&
test "x$fcmp_gtk3" != "xyes" &&
+   test "x$fcmp_gtk3x" != "xyes" &&
test "x$fcmp_gtk2" != "xyes" &&
test "x$fcmp_qt" != "xyes" ;then
   AC_MSG_ERROR([Cannot build modpack installer with any gui])
@@ -1136,6 +1168,7 @@
   dnl Hack to get a run-time icon -- not needed on Windows
   mp_gtk2_cflags="$mp_gtk2_cflags 
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
   mp_gtk3_cflags="$mp_gtk3_cflags 
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
+  mp_gtk3x_cflags="$mp_gtk3x_cflags 
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
 fi
 
 if test "x$fcmp_list" = "x" ; then
@@ -1144,6 +1177,7 @@
 
 AM_CONDITIONAL([MODINST], [test "x$modinst" != "xno"])
 AM_CONDITIONAL([MODINST_GTK3], [test "x$fcmp_gtk3" = "xyes"])
+AM_CONDITIONAL([MODINST_GTK3X], [test "x$fcmp_gtk3x" = "xyes"])
 AM_CONDITIONAL([MODINST_GTK2], [test "x$fcmp_gtk2" = "xyes"])
 AM_CONDITIONAL([MODINST_QT], [test "x$fcmp_qt" = "xyes"])
 AM_CONDITIONAL([MODINST_CLI], [test "x$fcmp_cli" = "xyes"])
@@ -1211,6 +1245,9 @@
 AC_SUBST([mp_gtk3_cflags])
 AC_SUBST([mp_gtk3_libs])
 AC_SUBST([mp_gtk3_ldflags])
+AC_SUBST([mp_gtk3x_cflags])
+AC_SUBST([mp_gtk3x_libs])
+AC_SUBST([mp_gtk3x_ldflags])
 AC_SUBST([mp_qt_cppflags])
 AC_SUBST([mp_qt_cxxflags])
 AC_SUBST([mp_qt_libs])

Modified: trunk/tools/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=32696&r1=32695&r2=32696&view=diff
==
--- trunk/tools/Makefile.am (original)
+++ trunk/tools/Makefile.am Sat May 14 08:13:05 2016
@@ -28,6 +28,9 @@
 endif
 if MODINST_GTK3
 bin_PROGRAMS += freeciv-mp-gtk3
+endif
+if MODINST_GTK3X
+bin_PROGRAMS += freeciv-mp-gtk3x
 endif
 if MODINST_QT
 bin_PROGRAMS += freeciv-mp-qt
@@ -164,6 +167,28 @@
$(MPICON)
 endif
 
+if MODINST_GTK3X
+freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags) -DGTK3XMP
+
+# For the time being gtk3 gui sources are ok in respect to gtk3x
+# requirements - there's no deprecated functions used.
+# The only difference is in the name the binary prints out - that's what
+# -DGTK3XMP in the freeciv_mp_gtk3x_CPPFLAGS is for.
+# Instead of maintaining two files, use the same one until there
+# comes real reason to make them differ.
+freeciv_mp_gtk3x_SOURCES = mpgui_gtk3.c
+
+freeciv_mp_gtk3x_LDFLAGS = $(mp_gtk3x_ldflags)
+
+