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

2014-06-03 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jun  3 21:54:24 2014
New Revision: 25040

URL: http://svn.gna.org/viewcvs/freeciv?rev=25040view=rev
Log:
Improve documentation of road and base ruleset definitions, especially
cross-referencing.

See gna bug #22120.

Modified:
trunk/data/alien/techs.ruleset
trunk/data/alien/terrain.ruleset
trunk/data/civ1/terrain.ruleset
trunk/data/civ2/terrain.ruleset
trunk/data/civ2civ3/techs.ruleset
trunk/data/civ2civ3/terrain.ruleset
trunk/data/classic/techs.ruleset
trunk/data/classic/terrain.ruleset
trunk/data/experimental/techs.ruleset
trunk/data/experimental/terrain.ruleset
trunk/data/multiplayer/techs.ruleset
trunk/data/multiplayer/terrain.ruleset

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

Modified: trunk/data/alien/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/techs.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/civ2civ3/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/techs.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/classic/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/techs.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/experimental/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/techs.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/multiplayer/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/techs.ruleset?rev=25040r1=25039r2=25040view=diff

Modified: trunk/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=25040r1=25039r2=25040view=diff


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


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

2014-06-03 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jun  3 21:54:21 2014
New Revision: 25039

URL: http://svn.gna.org/viewcvs/freeciv?rev=25039view=rev
Log:
Fix cross-references in ruleset comments from 'default' to 'classic'
ruleset, and other tweaks.

See gna bug #22119.

Modified:
trunk/data/alien/units.ruleset
trunk/data/civ1/nations.ruleset
trunk/data/civ1/techs.ruleset
trunk/data/civ1/units.ruleset
trunk/data/civ2/nations.ruleset
trunk/data/civ2/techs.ruleset
trunk/data/civ2/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset

Modified: trunk/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/alien/units.ruleset  (original)
+++ trunk/data/alien/units.ruleset  Tue Jun  3 21:54:21 2014
@@ -257,7 +257,7 @@
 ; AddToCity  = can disband to add a single point of population to a city
 ;(see cities.ruleset for limitation of this ability)
 ; Fanatic= can only be built by governments that allow them
-;(see data/civ2/governments.ruleset, Fanaticism government)
+;(see civ2/governments.ruleset, Fundamentalism government)
 ; Unique = a player can only have one of these units in the game at
 ;the same time; barbarians cannot use this at present
 ; GameLoss   = losing one of these units means you lose the game, but it

Modified: trunk/data/civ1/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/nations.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/civ1/nations.ruleset (original)
+++ trunk/data/civ1/nations.ruleset Tue Jun  3 21:54:21 2014
@@ -7,7 +7,8 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/default/nations.ruleset for more information.
+; See classic/nations.ruleset and default/nationlist.ruleset for more
+; information.
 
 [datafile]
 description=Civ1-equivalent nations data for Freeciv

Modified: trunk/data/civ1/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/techs.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/civ1/techs.ruleset   (original)
+++ trunk/data/civ1/techs.ruleset   Tue Jun  3 21:54:21 2014
@@ -40,7 +40,7 @@
 ; root_req  = advance required before acquiring this one, inherited
 ; by all techs that require this tech in turn unless
 ; None is given explicitly
-; flags = special flag strings (see default/techs.ruleset)
+; flags = special flag strings (see classic/techs.ruleset)
 ; graphic   = icon for technology
 ; graphic_alt   = alternate icon
 ; helptext = optional help text string (set units ruleset for examples)

Modified: trunk/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/civ1/units.ruleset   (original)
+++ trunk/data/civ1/units.ruleset   Tue Jun  3 21:54:21 2014
@@ -7,7 +7,7 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/classic/units.ruleset for more information.
+; See classic/units.ruleset for more information.
 
 [datafile]
 description=Civ1-style unit_type data for Freeciv

Modified: trunk/data/civ2/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/nations.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/civ2/nations.ruleset (original)
+++ trunk/data/civ2/nations.ruleset Tue Jun  3 21:54:21 2014
@@ -7,7 +7,8 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/default/nations.ruleset for more information.
+; See classic/nations.ruleset and default/nationlist.ruleset for more
+; information.
 
 ; Note: The list is based on Civ2-ToT.
 

Modified: trunk/data/civ2/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/techs.ruleset?rev=25039r1=25038r2=25039view=diff
==
--- trunk/data/civ2/techs.ruleset   (original)
+++ trunk/data/civ2/techs.ruleset   Tue Jun  3 21:54:21 2014
@@ -40,7 +40,7 @@
 ; root_req  = advance required before acquiring this one, inherited
 ; by all techs that require this tech in turn unless
 ; None is given explicitly
-; flags = special flag strings (see default/techs.ruleset)
+; 

[Freeciv-commits] r25041 - in /branches/S2_5/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/

2014-06-03 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jun  3 21:55:36 2014
New Revision: 25041

URL: http://svn.gna.org/viewcvs/freeciv?rev=25041view=rev
Log:
Document numbers of user ruleset flags available, and generally improve
user flag documentation.

See gna bug #22118.

Modified:
branches/S2_5/data/alien/techs.ruleset
branches/S2_5/data/alien/terrain.ruleset
branches/S2_5/data/alien/units.ruleset
branches/S2_5/data/civ1/techs.ruleset
branches/S2_5/data/civ1/terrain.ruleset
branches/S2_5/data/civ1/units.ruleset
branches/S2_5/data/civ2/techs.ruleset
branches/S2_5/data/civ2/terrain.ruleset
branches/S2_5/data/civ2/units.ruleset
branches/S2_5/data/civ2civ3/techs.ruleset
branches/S2_5/data/civ2civ3/terrain.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
branches/S2_5/data/classic/techs.ruleset
branches/S2_5/data/classic/terrain.ruleset
branches/S2_5/data/classic/units.ruleset
branches/S2_5/data/experimental/techs.ruleset
branches/S2_5/data/experimental/terrain.ruleset
branches/S2_5/data/experimental/units.ruleset
branches/S2_5/data/multiplayer/techs.ruleset
branches/S2_5/data/multiplayer/terrain.ruleset
branches/S2_5/data/multiplayer/units.ruleset

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

Modified: branches/S2_5/data/alien/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ1/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2civ3/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/classic/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/experimental/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/multiplayer/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/techs.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/terrain.ruleset?rev=25041r1=25040r2=25041view=diff

Modified: branches/S2_5/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=25041r1=25040r2=25041view=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org

[Freeciv-commits] r25043 - in /branches/S2_5/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/

2014-06-03 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jun  3 21:55:44 2014
New Revision: 25043

URL: http://svn.gna.org/viewcvs/freeciv?rev=25043view=rev
Log:
Improve documentation of road and base ruleset definitions, especially
cross-referencing.

See gna bug #22120.

Modified:
branches/S2_5/data/alien/techs.ruleset
branches/S2_5/data/alien/terrain.ruleset
branches/S2_5/data/civ1/terrain.ruleset
branches/S2_5/data/civ2/terrain.ruleset
branches/S2_5/data/civ2civ3/techs.ruleset
branches/S2_5/data/civ2civ3/terrain.ruleset
branches/S2_5/data/classic/techs.ruleset
branches/S2_5/data/classic/terrain.ruleset
branches/S2_5/data/experimental/techs.ruleset
branches/S2_5/data/experimental/terrain.ruleset
branches/S2_5/data/multiplayer/techs.ruleset
branches/S2_5/data/multiplayer/terrain.ruleset

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

Modified: branches/S2_5/data/alien/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/techs.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/civ2civ3/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/techs.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/classic/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/techs.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/experimental/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/techs.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/terrain.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/multiplayer/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/techs.ruleset?rev=25043r1=25042r2=25043view=diff

Modified: branches/S2_5/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/terrain.ruleset?rev=25043r1=25042r2=25043view=diff


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


[Freeciv-commits] r25042 - in /branches/S2_5/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/

2014-06-03 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jun  3 21:55:40 2014
New Revision: 25042

URL: http://svn.gna.org/viewcvs/freeciv?rev=25042view=rev
Log:
Fix cross-references in ruleset comments from 'default' to 'classic'
ruleset, and other tweaks.

See gna bug #22119.

Modified:
branches/S2_5/data/alien/units.ruleset
branches/S2_5/data/civ1/nations.ruleset
branches/S2_5/data/civ1/techs.ruleset
branches/S2_5/data/civ1/units.ruleset
branches/S2_5/data/civ2/nations.ruleset
branches/S2_5/data/civ2/techs.ruleset
branches/S2_5/data/civ2/units.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
branches/S2_5/data/classic/units.ruleset
branches/S2_5/data/experimental/units.ruleset
branches/S2_5/data/multiplayer/units.ruleset

Modified: branches/S2_5/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/units.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/alien/units.ruleset  (original)
+++ branches/S2_5/data/alien/units.ruleset  Tue Jun  3 21:55:40 2014
@@ -254,7 +254,7 @@
 ; AddToCity  = can disband to add a single point of population to a city
 ;(see cities.ruleset for limitation of this ability)
 ; Fanatic= can only be built by governments that allow them
-;(see data/civ2/governments.ruleset, Fanaticism government)
+;(see civ2/governments.ruleset, Fundamentalism government)
 ; Unique = a player can only have one of these units in the game at
 ;the same time; barbarians cannot use this at present
 ; GameLoss   = losing one of these units means you lose the game, but it

Modified: branches/S2_5/data/civ1/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/nations.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/civ1/nations.ruleset (original)
+++ branches/S2_5/data/civ1/nations.ruleset Tue Jun  3 21:55:40 2014
@@ -7,7 +7,8 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/default/nations.ruleset for more information.
+; See classic/nations.ruleset and default/nationlist.ruleset for more
+; information.
 
 [datafile]
 description=Civ1-equivalent nations data for Freeciv

Modified: branches/S2_5/data/civ1/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/techs.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/civ1/techs.ruleset   (original)
+++ branches/S2_5/data/civ1/techs.ruleset   Tue Jun  3 21:55:40 2014
@@ -40,7 +40,7 @@
 ; root_req  = advance required before acquiring this one, inherited
 ; by all techs that require this tech in turn unless
 ; None is given explicitly
-; flags = special flag strings (see default/techs.ruleset)
+; flags = special flag strings (see classic/techs.ruleset)
 ; graphic   = icon for technology
 ; graphic_alt   = alternate icon
 ; helptext = optional help text string (set units ruleset for examples)

Modified: branches/S2_5/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/civ1/units.ruleset   (original)
+++ branches/S2_5/data/civ1/units.ruleset   Tue Jun  3 21:55:40 2014
@@ -7,7 +7,7 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/classic/units.ruleset for more information.
+; See classic/units.ruleset for more information.
 
 [datafile]
 description=Civ1-style unit_type data for Freeciv

Modified: branches/S2_5/data/civ2/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/nations.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/civ2/nations.ruleset (original)
+++ branches/S2_5/data/civ2/nations.ruleset Tue Jun  3 21:55:40 2014
@@ -7,7 +7,8 @@
 ; command rulesetdir mysubdir in the server to have freeciv
 ; use your new customized file.
 
-; See data/default/nations.ruleset for more information.
+; See classic/nations.ruleset and default/nationlist.ruleset for more
+; information.
 
 ; Note: The list is based on Civ2-ToT.
 

Modified: branches/S2_5/data/civ2/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/techs.ruleset?rev=25042r1=25041r2=25042view=diff
==
--- branches/S2_5/data/civ2/techs.ruleset   (original)
+++ branches/S2_5/data/civ2/techs.ruleset   Tue Jun  3 21:55:40 2014

[Freeciv-commits] r25044 - /trunk/server/srv_main.c

2014-06-03 Thread cazfi74
Author: cazfi
Date: Wed Jun  4 02:21:04 2014
New Revision: 25044

URL: http://svn.gna.org/viewcvs/freeciv?rev=25044view=rev
Log:
Fixed a crash when game is started with a player that has gotten nation assigned
based on player name.

See bug #22121

Modified:
trunk/server/srv_main.c

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=25044r1=25043r2=25044view=diff
==
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Wed Jun  4 02:21:04 2014
@@ -2129,9 +2129,7 @@
client_can_pick_nation(pnation)
NULL == pnation-player
(pleader = nation_leader_by_name(pnation, name))) {
-player_set_nation(pplayer, pnation);
-pplayer-style = style_of_nation(pnation);
-pplayer-is_male = nation_leader_is_male(pleader);
+player_set_nation_full(pplayer, pnation);
 break;
   }
 } allowed_nations_iterate_end;


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


[Freeciv-commits] r25046 - /branches/S2_5/tools/mpcli.c

2014-06-03 Thread cazfi74
Author: cazfi
Date: Wed Jun  4 02:25:42 2014
New Revision: 25046

URL: http://svn.gna.org/viewcvs/freeciv?rev=25046view=rev
Log:
Fixed compiler warning while building freeciv-mp-cli

Reported by Jacob Nevins jtn

See patch #4732

Modified:
branches/S2_5/tools/mpcli.c

Modified: branches/S2_5/tools/mpcli.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/mpcli.c?rev=25046r1=25045r2=25046view=diff
==
--- branches/S2_5/tools/mpcli.c (original)
+++ branches/S2_5/tools/mpcli.c Wed Jun  4 02:25:42 2014
@@ -113,7 +113,6 @@
   ui_options = fcmp_parse_cmdline(argc, argv);
 
   if (ui_options != -1) {
-char verbuf[2048];
 const char *rev_ver = fc_svn_revision();
 
 load_install_info_lists(fcmp);


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


[Freeciv-commits] r25045 - /trunk/tools/mpcli.c

2014-06-03 Thread cazfi74
Author: cazfi
Date: Wed Jun  4 02:25:37 2014
New Revision: 25045

URL: http://svn.gna.org/viewcvs/freeciv?rev=25045view=rev
Log:
Fixed compiler warning while building freeciv-mp-cli

Reported by Jacob Nevins jtn

See patch #4732

Modified:
trunk/tools/mpcli.c

Modified: trunk/tools/mpcli.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/mpcli.c?rev=25045r1=25044r2=25045view=diff
==
--- trunk/tools/mpcli.c (original)
+++ trunk/tools/mpcli.c Wed Jun  4 02:25:37 2014
@@ -113,7 +113,6 @@
   ui_options = fcmp_parse_cmdline(argc, argv);
 
   if (ui_options != -1) {
-char verbuf[2048];
 const char *rev_ver = fc_svn_revision();
 
 load_install_info_lists(fcmp);


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