[Wesnoth-cvs-commits] wesnoth/data game.cfg traits.cfg

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/05/30 07:47:55

Modified files:
        data           : game.cfg traits.cfg 

Log message:
        Neither names.cfg nor traits.cfg contain relevant WML, don't put them 
in [+units] tags. The scenarios directories don't contain WML files, don't 
preprocess them. Don't change the text domain to itself at each traits macro 
substitution, do it only once and benefit from file scoping.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/game.cfg.diff?tr1=1.156&tr2=1.157&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/traits.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: wesnoth/data/game.cfg
diff -u wesnoth/data/game.cfg:1.156 wesnoth/data/game.cfg:1.157
--- wesnoth/data/game.cfg:1.156 Wed May 18 14:06:29 2005
+++ wesnoth/data/game.cfg       Mon May 30 07:47:54 2005
@@ -1,8 +1,6 @@
 {themes}
 
-[+units]
-       {traits.cfg}
-[/units]
+{traits.cfg}
 
 {utils.cfg}
 
@@ -11,9 +9,7 @@
 
 {schedules.cfg}
 
-[+units]
-       {names.cfg}
-[/units]
+{names.cfg}
 
 {multiplayer.cfg}
 
@@ -25,7 +21,6 @@
 
 {terrain_generator.cfg}
 
-{~scenarios}
 {campaigns}
 {~campaigns}
 
@@ -1712,6 +1707,4 @@
 {scenarios/tutorial}
 #endif
 
-{scenarios}
-
 {scenario-test.cfg}
Index: wesnoth/data/traits.cfg
diff -u wesnoth/data/traits.cfg:1.3 wesnoth/data/traits.cfg:1.4
--- wesnoth/data/traits.cfg:1.3 Thu Apr  7 21:16:49 2005
+++ wesnoth/data/traits.cfg     Mon May 30 07:47:54 2005
@@ -1,6 +1,7 @@
+#textdomain wesnoth
+
 #define TRAIT_LOYAL
        [trait]
-       #textdomain wesnoth
        id=loyal
        name= _ "loyal"
        description= _ "Zero upkeep"
@@ -12,7 +13,6 @@
 
 #define TRAIT_UNDEAD
        [trait]
-       #textdomain wesnoth
        id=undead
        name= _ "undead"
        description= _ "Immune to poison"
@@ -21,7 +21,6 @@
 
 #define TRAIT_STRONG
        [trait]
-       #textdomain wesnoth
        id=strong
        name= _ "strong"
                [effect]
@@ -39,7 +38,6 @@
 
 #define TRAIT_DEXTROUS
        [trait]
-       #textdomain wesnoth
        id=dextrous
        name= _ "dextrous"
                [effect]
@@ -52,7 +50,6 @@
 
 #define TRAIT_QUICK
        [trait]
-       #textdomain wesnoth
        id=quick
        name= _ "quick"
                [effect]
@@ -69,7 +66,6 @@
 
 #define TRAIT_INTELLIGENT
        [trait]
-       #textdomain wesnoth
        id=intelligent
        name= _ "intelligent"
                [effect]
@@ -81,7 +77,6 @@
 
 #define TRAIT_RESILIENT
        [trait]
-       #textdomain wesnoth
        id=resilient
        name= _ "resilient"
                [effect]