From e86ea794566cfd8a40f8d868b49700367efc96ba Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 21 Aug 2008 01:53:31 +0000 Subject: [PATCH] Better name and definition of a no-recall-list nacro, suggested by Sapient. --- .../Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg | 2 +- .../The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg | 2 +- data/core/macros/unit-utils.cfg | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg index 920dab9bfdb..19895c3d40f 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg @@ -354,7 +354,7 @@ {MODIFY_UNIT ( side=1 - {ON_MAP_ONLY} + {NOT_ON_RECALL_LIST} [not] id=Malin Keshar diff --git a/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg b/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg index b1d537c754c..846f348c516 100644 --- a/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg +++ b/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg @@ -461,7 +461,7 @@ variable=stored_Sir_Gerrick_army [filter] side=1 - {ON_MAP_ONLY} + {NOT_ON_RECALL_LIST} [/filter] kill=yes [/store_unit] diff --git a/data/core/macros/unit-utils.cfg b/data/core/macros/unit-utils.cfg index 6953680ee96..55e429bc7f5 100644 --- a/data/core/macros/unit-utils.cfg +++ b/data/core/macros/unit-utils.cfg @@ -8,8 +8,11 @@ 99 #enddef # Use this to restrict a filter to on-map units, not the recaall list. -#define ON_MAP_ONLY - x,y=1-99,1-99 #enddef +#define NOT_ON_RECALL_LIST + [not] + x,y=recall,recall + [/not] +#enddef #define GENERIC_UNIT SIDE TYPE X Y # Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a