Author: esr
Date: Wed Feb 27 03:20:28 2008
New Revision: 24105
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24105&view=rev
Log:
Get rid of MP_GENERIC_UNIT.
Modified:
trunk/data/core/macros/unit-utils.cfg
trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
Modified: trunk/data/core/macros/unit-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/unit-utils.cfg?rev=24105&r1=24104&r2=24105&view=diff
==============================================================================
--- trunk/data/core/macros/unit-utils.cfg (original)
+++ trunk/data/core/macros/unit-utils.cfg Wed Feb 27 03:20:28 2008
@@ -18,23 +18,7 @@
[/unit]
#enddef
-#define MP_GENERIC_UNIT SIDE TYPE X Y
- # Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a
- # random name and no traits.
- # This can be removed and GENERIC_UNIT be used instead once random traits
- # work in multiplayer.
- [unit]
- side={SIDE}
- type={TYPE}
- x={X}
- y={Y}
- generate_description=yes
- random_traits=no
- upkeep=full
- [/unit]
-#enddef
-
-#define NOTRAIT_UNIT TYPE SIDE X Y
+#define NOTRAIT_UNIT SIDE TYPE X Y
# Creates a unit with no traits, random gender and name.
#
# Example:
Modified: trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg?rev=24105&r1=24104&r2=24105&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg (original)
+++ trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg Wed Feb 27 03:20:28
2008
@@ -233,48 +233,48 @@
#enddef
#define TS_SPAWN1 TYPE
- {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({TYPE}) 12 10})}
- {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({TYPE}) 29 7})}
- {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({TYPE}) 41 18})}
- {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({TYPE}) 36 32})}
- {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({TYPE}) 19 36})}
- {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({TYPE}) 7 25})}
+ {IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 12 10})}
+ {IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 29 7})}
+ {IF_ALIVE 4 ({NOTRAIT_UNIT 1 ({TYPE}) 41 18})}
+ {IF_ALIVE 5 ({NOTRAIT_UNIT 1 ({TYPE}) 36 32})}
+ {IF_ALIVE 6 ({NOTRAIT_UNIT 1 ({TYPE}) 19 36})}
+ {IF_ALIVE 7 ({NOTRAIT_UNIT 1 ({TYPE}) 7 25})}
#enddef
#define TS_SPAWN2 TYPE
- {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({TYPE}) 19 7})}
- {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({TYPE}) 36 10})}
- {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({TYPE}) 41 25})}
- {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({TYPE}) 29 36})}
- {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({TYPE}) 12 32})}
- {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({TYPE}) 7 18})}
+ {IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 19 7})}
+ {IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 36 10})}
+ {IF_ALIVE 4 ({NOTRAIT_UNIT 1 ({TYPE}) 41 25})}
+ {IF_ALIVE 5 ({NOTRAIT_UNIT 1 ({TYPE}) 29 36})}
+ {IF_ALIVE 6 ({NOTRAIT_UNIT 1 ({TYPE}) 12 32})}
+ {IF_ALIVE 7 ({NOTRAIT_UNIT 1 ({TYPE}) 7 18})}
#enddef
#define TS_SWAMP_SPAWN TYPE
- {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({TYPE}) 15 6})}
- {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({TYPE}) 35 7})}
- {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({TYPE}) 44 22})}
- {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({TYPE}) 33 37})}
- {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({TYPE}) 13 36})}
- {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({TYPE}) 4 20})}
+ {IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 15 6})}
+ {IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 35 7})}
+ {IF_ALIVE 4 ({NOTRAIT_UNIT 1 ({TYPE}) 44 22})}
+ {IF_ALIVE 5 ({NOTRAIT_UNIT 1 ({TYPE}) 33 37})}
+ {IF_ALIVE 6 ({NOTRAIT_UNIT 1 ({TYPE}) 13 36})}
+ {IF_ALIVE 7 ({NOTRAIT_UNIT 1 ({TYPE}) 4 20})}
#enddef
#define TS_LAKE_SPAWN TYPE
- {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({TYPE}) 17 10})}
- {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({TYPE}) 32 10})}
- {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({TYPE}) 39 22})}
- {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({TYPE}) 31 33})}
- {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({TYPE}) 16 32})}
- {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({TYPE}) 9 21})}
+ {IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 17 10})}
+ {IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 32 10})}
+ {IF_ALIVE 4 ({NOTRAIT_UNIT 1 ({TYPE}) 39 22})}
+ {IF_ALIVE 5 ({NOTRAIT_UNIT 1 ({TYPE}) 31 33})}
+ {IF_ALIVE 6 ({NOTRAIT_UNIT 1 ({TYPE}) 16 32})}
+ {IF_ALIVE 7 ({NOTRAIT_UNIT 1 ({TYPE}) 9 21})}
#enddef
#define TS_HOME_SPAWN TYPE
- {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({TYPE}) 18 12})}
- {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({TYPE}) 30 12})}
- {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({TYPE}) 36 21})}
- {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({TYPE}) 30 30})}
- {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({TYPE}) 18 13})}
- {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({TYPE}) 12 21})}
+ {IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 18 12})}
+ {IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 30 12})}
+ {IF_ALIVE 4 ({NOTRAIT_UNIT 1 ({TYPE}) 36 21})}
+ {IF_ALIVE 5 ({NOTRAIT_UNIT 1 ({TYPE}) 30 30})}
+ {IF_ALIVE 6 ({NOTRAIT_UNIT 1 ({TYPE}) 18 13})}
+ {IF_ALIVE 7 ({NOTRAIT_UNIT 1 ({TYPE}) 12 21})}
#enddef
#define TS_SPAWNS
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
