OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove unnecessary uses of "action" and "invoker".

Browse source
This commit is contained in:
Mari the Deer 2022-11-26 11:57:17 +01:00
commit 23947d8471
11 changed files with 99 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zscript/items/swwm_funstuff.zsc
View file

@ -654,7 +654,7 @@ Class PartyTime : SWWMNonInteractiveActor
}
SetOrigin(target.pos,false);
}
action void A_Confetti()
void A_Confetti()
{
if ( !bAMBUSH && !bSTANDSTILL ) A_StartSound("misc/tada",CHAN_ITEM);
double ang, pt;
@ -1118,7 +1118,7 @@ Class Chancebox : Actor
}
}
action void A_DropSomething()
void A_DropSomething()
{
Array<Class <SWWMCollectible> > candidates;
candidates.Clear();
@ -1139,7 +1139,7 @@ Class Chancebox : Actor
if ( f < candidates.Size() )
candidates.Delete(f);
}
if ( (candidates.Size() <= 0) || invoker.dud )
if ( (candidates.Size() <= 0) || dud )
{
// no collectible candidates? just burst into treats
if ( (scale.x > .5) && (Random[Chancebox](0,int(9*scale.x*scale.x)) < 3) )
@ -1186,7 +1186,7 @@ Class Chancebox : Actor
s.scale *= 2.4;
}
}
action void A_Confetti()
void A_Confetti()
{
A_StartSound("misc/tada",CHAN_ITEM,pitch:1./scale.x);
double ang, pt;

24
zscript/items/swwm_powerups.zsc
View file

@ -2234,7 +2234,7 @@ Class MykradvoTendril : SWWMNonInteractiveActor
{
Vector3 nextpos, nextdir;
action void A_Trace()
void A_Trace()
{
tics = bMISSILEMORE?2:1;
Vector3 x, y, z;
@ -2263,7 +2263,7 @@ Class MykradvoTendril : SWWMNonInteractiveActor
t.hitlist[i].hitactor.Howl();
}
}
invoker.nextpos = level.Vec3Offset(pos,x*speed);
nextpos = level.Vec3Offset(pos,x*speed);
if ( !bSTANDSTILL && (!tracer || !tracer.bSHOOTABLE || (tracer.Health <= 0) || ((tracer.bBOSS || tracer.FindInventory("BossMarker")) && !bMISSILEMORE)) )
{
ReactionTime--;
@ -2278,7 +2278,7 @@ Class MykradvoTendril : SWWMNonInteractiveActor
if ( tracer )
{
Vector3 destofs = bMISSILEMORE?tracer.Vec3Offset(0,0,tracer.Height/2.):tracer.Vec3Offset(FRandom[Mykradvo](-1.2,1.2)*tracer.Radius,FRandom[Mykradvo](-1.2,1.2)*tracer.Radius,FRandom[Mykradvo](-.1,1.1)*tracer.height);
Vector3 dirto = level.Vec3Diff(invoker.nextpos,destofs);
Vector3 dirto = level.Vec3Diff(nextpos,destofs);
double dist = dirto.length();
if ( dist > 1 )
{
@ -2288,9 +2288,9 @@ Class MykradvoTendril : SWWMNonInteractiveActor
// early split
if ( dist < speed ) bMISSILEEVENMORE = true;
}
invoker.nextdir = dir;
nextdir = dir;
}
action void A_Spread()
void A_Spread()
{
if ( bMISSILEMORE && bMISSILEEVENMORE )
{
@ -2300,7 +2300,7 @@ Class MykradvoTendril : SWWMNonInteractiveActor
int ntendies = tracer?clamp(tracer.GetSpawnHealth()/400,2,10):2;
for ( int i=0; i<ntendies; i++ )
{
let r = Spawn("MykradvoSmallTendril",invoker.nextpos);
let r = Spawn("MykradvoSmallTendril",nextpos);
double a = FRandom[Mykradvo](0,360), s = FRandom[Mykradvo](0.,1.);
Vector3 sdir = SWWMUtility.ConeSpread(x,y,z,a,s);
r.angle = atan2(sdir.y,sdir.x);
@ -2323,7 +2323,7 @@ Class MykradvoTendril : SWWMNonInteractiveActor
{
double a = FRandom[ExploS](0,360), s = FRandom[ExploS](0,1.);
Vector3 sdir = SWWMUtility.ConeSpread(x,y,z,a,s);
let r = Spawn("MykradvoSmallNullTendril",invoker.nextpos);
let r = Spawn("MykradvoSmallNullTendril",nextpos);
r.angle = atan2(sdir.y,sdir.x);
r.pitch = asin(-sdir.z);
r.target = target;
@ -2333,9 +2333,9 @@ Class MykradvoTendril : SWWMNonInteractiveActor
}
return;
}
let b = Spawn(GetClass(),invoker.nextpos);
b.angle = atan2(invoker.nextdir.y,invoker.nextdir.x);
b.pitch = asin(-invoker.nextdir.z);
let b = Spawn(GetClass(),nextpos);
b.angle = atan2(nextdir.y,nextdir.x);
b.pitch = asin(-nextdir.z);
b.target = target;
b.tracer = tracer;
b.special1 = special1+1;
@ -2657,7 +2657,7 @@ Class MykradvoBurst : SWWMNonInteractiveActor
{
Spawn:
XEX4 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\ 2 Bright;
TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE)&&!(invoker.targets.Size()),1);
TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE)&&!(targets.Size()),1);
Wait;
TNT1 A 1;
Stop;
@ -2772,7 +2772,7 @@ Class Mykradvo : Inventory
return true;
}
action void A_Zap()
void A_Zap()
{
int numpt = Random[ExploS](2,4);
for ( int i=0; i<numpt; i++ )