summaryrefslogtreecommitdiffstats
path: root/TemplePushing.c4s/System.c4g
diff options
context:
space:
mode:
Diffstat (limited to 'TemplePushing.c4s/System.c4g')
-rw-r--r--TemplePushing.c4s/System.c4g/Curses.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/TemplePushing.c4s/System.c4g/Curses.c b/TemplePushing.c4s/System.c4g/Curses.c
index 7a1e86f..248df13 100644
--- a/TemplePushing.c4s/System.c4g/Curses.c
+++ b/TemplePushing.c4s/System.c4g/Curses.c
@@ -1,20 +1,18 @@
-/*-- Prevent Curse Scrolls from vanishing --*/
+/*-- Prevent curse scrolls from vanishing --*/
#strict 2
#appendto CAHE
-local pCasterClonk;
-
public func Activate(pCaster,pRealcaster)
{
- var pClonk;
- if(pRealcaster) pClonk=pRealcaster;
- else pClonk=pCaster;
-
+ var pClonk=pRealcaster;
+ if(!pClonk) pClonk=pCaster;
+ if (!pClonk) return(1);
+
pCasterClonk = pClonk; // Caster speichern, damit es sich unter keinen Umständen selber wählen kann
// Auswählen wenn möglich
- if (pClonk->~DoSpellSelect(this(),300)) return(1);
+ if (pClonk->~DoSpellSelect(this(), 300, pCaster)) return(1);
var pTarget;
// Clonk kann nicht auswählen: nächsten Gegner verfluchen
@@ -23,8 +21,6 @@ public func Activate(pCaster,pRealcaster)
return(ActivateTarget(pTarget));
// ansonsten geht nich
- var iResult;
- if (iResult = CheckEffect("*Curse*", 0, 125)) return(iResult!=-1 && RemoveObject());
-
+ RemoveObject();
return(0);
-}
+} \ No newline at end of file