Use the simpler CLEAR_SPAWN_GROUP instead of the long REMOVE_SPAWN_GROUP.

This commit is contained in:
J. Tyne 2013-02-01 05:17:13 +00:00
parent a4ced0614e
commit 80caf8623e

View File

@ -342,48 +342,6 @@ Note: You need to use the default map settings for the scenario to work right."
{CLEAR_VARIABLE main_spawns[{NUMBER}]}
#enddef
#define REMOVE_SPAWN_GROUP NUMBER
{VARIABLE index {NUMBER}}
[while]
[variable]
name=index
less_than=$main_group
[/variable]
[do]
{VARIABLE from $index}
{VARIABLE_OP from add 1}
# clear the array at index
{CLEAR_VARIABLE main_spawns[$index].spawn_type}
#{CLEAR_VARIABLE main_spawns[$index].spawn_up1}
#{CLEAR_VARIABLE main_spawns[$index].spawn_up2}
#{CLEAR_VARIABLE main_spawns[$index].spawn_up3}
# copy values 'from' to 'index'
{VARIABLE main_spawns[$index].x $main_spawns[$from].x}
{VARIABLE main_spawns[$index].y $main_spawns[$from].y}
{VARIABLE spawn_number $main_spawns[$from].spawn_number}
{VARIABLE main_spawns[$index].spawn_number $spawn_number}
{VARIABLE spawn_id 1}
[while]
[variable]
name=spawn_id
less_than_equal_to=$spawn_number
[/variable]
[do]
{VARIABLE main_spawns[$index].spawn_type[$spawn_id].type $main_spawns[$from].spawn_type[$spawn_id].type}
{VARIABLE main_spawns[$index].spawn_type[$spawn_id].up1 $main_spawns[$from].spawn_type[$spawn_id].up1}
{VARIABLE main_spawns[$index].spawn_type[$spawn_id].up2 $main_spawns[$from].spawn_type[$spawn_id].up2}
{VARIABLE main_spawns[$index].spawn_type[$spawn_id].up3 $main_spawns[$from].spawn_type[$spawn_id].up3}
{VARIABLE_OP spawn_id add 1}
[/do]
[/while]
{VARIABLE_OP index add 1}
[/do]
[/while]
{VARIABLE spawn_id main_spawns[$main_group]}
{CLEAR_VARIABLE spawn_id}
{VARIABLE_OP main_group sub 1}
#enddef
#define VICTORY_CHECK_FROM_TURN TURN
[event]
name=die
@ -705,7 +663,7 @@ Note: You need to use the default map settings for the scenario to work right."
[/do]
[/while]
{PLACE_SPAWN_GROUP $main_spawns[$group_id].x $main_spawns[$group_id].y}
{REMOVE_SPAWN_GROUP $group_id}
{CLEAR_SPAWN_GROUP $group_id}
[music]
name=frantic.ogg
ms_before=300
@ -1446,7 +1404,6 @@ The weather will also change randomly, affecting the layout of the map.
#undef SPAWN_UNIT
#undef ADJUST_UNIT_LEVEL
#undef CLEAR_SPAWN_GROUP
#undef REMOVE_SPAWN_GROUP
#undef VICTORY_CHECK_FROM_TURN
#undef FINAL_SPAWN
#undef REGULAR_RANDOM_SPAWNS