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

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  05/03/23 03:45:36

Modified files:
        data           : game.cfg utils.cfg 

Log message:
        Initialise the traits sooner so they can be used from utils.cfg, then 
use it in the UNIT macro

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/game.cfg.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: wesnoth/data/game.cfg
diff -u wesnoth/data/game.cfg:1.147 wesnoth/data/game.cfg:1.148
--- wesnoth/data/game.cfg:1.147 Mon Mar 21 04:33:07 2005
+++ wesnoth/data/game.cfg       Wed Mar 23 03:45:35 2005
@@ -1,5 +1,9 @@
 {themes}
 
+[+units]
+       {traits.cfg}
+[/units]
+
 {utils.cfg}
 
 {utils}
@@ -11,7 +15,6 @@
        {names.cfg}
 [/units]
 
-
 {multiplayer.cfg}
 
 {terrain.cfg}
@@ -436,8 +439,6 @@
        {units}
        {~units}
 
-       {traits.cfg}
-
        #traits that are common to all races and units
        {TRAIT_STRONG}
        {TRAIT_QUICK}
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.14 wesnoth/data/utils.cfg:1.15
--- wesnoth/data/utils.cfg:1.14 Sun Mar 20 09:36:16 2005
+++ wesnoth/data/utils.cfg      Wed Mar 23 03:45:35 2005
@@ -174,13 +174,16 @@
 "&"+{IMG}+"="+{TXT1}+"="+{TXT2}#enddef
 
 #define UNIT TYPE DESCRIPTION SIDE X Y
-               [unit]
-                       type={TYPE}
-                       description={DESCRIPTION}
-                       side={SIDE}
-                       x={X}
-                       y={Y}
-               [/unit]
+       [unit]
+               type={TYPE}
+               description={DESCRIPTION}
+               side={SIDE}
+               x={X}
+               y={Y}
+               [modifications]
+                       {TRAIT_LOYAL}
+               [/modifications]
+       [/unit]
 #enddef
 
 #define PLACE_IMAGE IMAGE_FILE X Y