summaryrefslogtreecommitdiffstats
path: root/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2019-01-12 22:13:54 +0100
committerMarkus Mittendrein <git@maxmitti.tk>2019-01-23 23:50:09 +0100
commitbf59bce381202eb67dbeceb00ebf9d75d9cd6d35 (patch)
tree5e8f790be245d17815e6cf2a2b572f85882bbba1 /TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
parent93226e98639dd95f7e4e3ed5637a671edd63e984 (diff)
downloadtempelschubsen-bf59bce381202eb67dbeceb00ebf9d75d9cd6d35.tar.gz
tempelschubsen-bf59bce381202eb67dbeceb00ebf9d75d9cd6d35.zip
Fix error in outfader
Diffstat (limited to 'TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c')
-rw-r--r--TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
index 32d7e9c..a75f7c1 100644
--- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
+++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
@@ -70,7 +70,11 @@ func FxFadeOutTimer(pTarget,iEffectNumber)
if (!pTarget) return(-1);
if (Contained(pTarget) || pTarget->~AvoidFadeOut()) return(-1);
EffectVar(0,pTarget,iEffectNumber)--;
- if (!EffectVar(0,pTarget,iEffectNumber)) RemoveObject(pTarget);
+ if (!EffectVar(0,pTarget,iEffectNumber))
+ {
+ RemoveObject(pTarget);
+ return(-1);
+ }
SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255), 255-EffectVar(0,pTarget,iEffectNumber)),pTarget);
return(1);
}