diff options
| author | Markus Mittendrein <git@maxmitti.tk> | 2019-01-12 22:15:28 +0100 |
|---|---|---|
| committer | Markus Mittendrein <git@maxmitti.tk> | 2019-01-23 23:50:09 +0100 |
| commit | 2442482df9b13795a69b9023d72a4f9bd32fd4db (patch) | |
| tree | 2f33c130a6717440b696c75398da763032759b6c | |
| parent | bf59bce381202eb67dbeceb00ebf9d75d9cd6d35 (diff) | |
| download | tempelschubsen-2442482df9b13795a69b9023d72a4f9bd32fd4db.tar.gz tempelschubsen-2442482df9b13795a69b9023d72a4f9bd32fd4db.zip | |
Fix indentation and clean whitespace in outfader
| -rw-r--r-- | TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c index a75f7c1..83939f8 100644 --- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c +++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c @@ -2,10 +2,10 @@ #strict 2 -protected func Activate(iByPlayer) +protected func Activate(iByPlayer) { - MessageWindow(GetDesc(), iByPlayer); - return(1); + MessageWindow(GetDesc(), iByPlayer); + return(1); } func Fading(iPlr) @@ -21,22 +21,22 @@ func Fading(iPlr) } else if (!GetAlive(obj)) { - if (GetOwner(obj)== -1) FadeOut(obj,1); + if (GetOwner(obj)== -1) FadeOut(obj,1); else FadeOut(obj,5); } else if (GetAction(obj)=="Be") { - if (GetOwner(obj)== -1) FadeOut(obj,2); + if (GetOwner(obj)== -1) FadeOut(obj,2); else FadeOut(obj,3); } else if (GetAction(obj)=="None") { - if (GetOwner(obj)== -1) FadeOut(obj,2); + if (GetOwner(obj)== -1) FadeOut(obj,2); else FadeOut(obj,3); } else if (GetAction(obj)=="Exist") { - if (GetOwner(obj)== -1) FadeOut(obj,2); + if (GetOwner(obj)== -1) FadeOut(obj,2); else FadeOut(obj,3); } } @@ -46,37 +46,37 @@ func Fading(iPlr) global func FadeOut(pObj,iTime) { - if (!iTime) iTime=2; - if (!pObj) pObj=this; - if (GetEffect("FadeOut",pObj)) return(0); - AddEffect("FadeOut",pObj,200,iTime,0,OFDR); - return(1); + if (!iTime) iTime=2; + if (!pObj) pObj=this; + if (GetEffect("FadeOut",pObj)) return(0); + AddEffect("FadeOut",pObj,200,iTime,0,OFDR); + return(1); } func FxFadeOutStart(pTarget,iEffectNumber) { - EffectVar(0,pTarget,iEffectNumber)=255; - return(1); + EffectVar(0,pTarget,iEffectNumber)=255; + return(1); } func FxFadeOutStop(pTarget,iEffectNumber) { - SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255)),pTarget); - return(1); + SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255)),pTarget); + return(1); } 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); - return(-1); - } - SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255), 255-EffectVar(0,pTarget,iEffectNumber)),pTarget); - return(1); +{ + if (!pTarget) return(-1); + if (Contained(pTarget) || pTarget->~AvoidFadeOut()) return(-1); + EffectVar(0,pTarget,iEffectNumber)--; + 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); } global func ImportantID(idObj) { return 0; } |