summaryrefslogtreecommitdiffstats
path: root/TemplePushing.c4s/Rules.c4d
diff options
context:
space:
mode:
authorMittendrein Markus <maxmitti@gmx.net>2016-02-14 18:10:24 +0100
committerMittendrein Markus <maxmitti@gmx.net>2016-02-14 18:10:24 +0100
commit50ffbf0f455f1ff34e98f0bdac3b7a9bf09d9192 (patch)
treeaab7cd9fbab7f0144676c639defdf95d47b43cb7 /TemplePushing.c4s/Rules.c4d
parent33fc980e1ef5b82787f9687abe77d44f75d5a343 (diff)
downloadtempelschubsen-50ffbf0f455f1ff34e98f0bdac3b7a9bf09d9192.tar.gz
tempelschubsen-50ffbf0f455f1ff34e98f0bdac3b7a9bf09d9192.zip
Colorize Scrolls with a color specific to their "magic element"
Diffstat (limited to 'TemplePushing.c4s/Rules.c4d')
-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 ccd9e08..de61ef5 100644
--- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
+++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c
@@ -61,7 +61,7 @@ func FxFadeOutStart(pTarget,iEffectNumber)
func FxFadeOutStop(pTarget,iEffectNumber)
{
- SetClrModulation(RGBa(255,255,255),pTarget);
+ SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255)),pTarget);
return(1);
}
@@ -71,7 +71,7 @@ func FxFadeOutTimer(pTarget,iEffectNumber)
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);
+ SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255), 255-EffectVar(0,pTarget,iEffectNumber)),pTarget);
return(1);
}