summaryrefslogtreecommitdiffstats
path: root/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
diff options
context:
space:
mode:
authorMittendrein Markus <maxmitti@gmx.net>2015-09-08 21:39:24 +0200
committerMittendrein Markus <maxmitti@gmx.net>2015-09-08 21:39:24 +0200
commit32c8a57f8c05104096e9457193f77d0237ab8911 (patch)
tree79cc4470e63f8db79b055e892dcd9f52e1492a60 /TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
parent510eec29df7b29a928d0244b58d9d110729e1508 (diff)
downloadtempelschubsen-32c8a57f8c05104096e9457193f77d0237ab8911.tar.gz
tempelschubsen-32c8a57f8c05104096e9457193f77d0237ab8911.zip
OutFader Doesn't remove scrolls while aiming
Diffstat (limited to 'TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c')
-rw-r--r--TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
index f5906f0..ccd9e08 100644
--- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
+++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
@@ -68,11 +68,11 @@ func FxFadeOutStop(pTarget,iEffectNumber)
func FxFadeOutTimer(pTarget,iEffectNumber)
{
if (!pTarget) return(-1);
- if (Contained(pTarget)) return(-1);
+ if (Contained(pTarget) || pTarget->~AvoidFadeOut()) return(-1);
EffectVar(0,pTarget,iEffectNumber)--;
if (!EffectVar(0,pTarget,iEffectNumber)) RemoveObject(pTarget);
SetClrModulation(RGBa(255,255,255,255-EffectVar(0,pTarget,iEffectNumber)),pTarget);
return(1);
}
-global func ImportantID(idObj) { return 0; } \ No newline at end of file
+global func ImportantID(idObj) { return 0; }