OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Revert "Another hotfix for stuff in gzdoom devbuilds."

Browse source 
This reverts commit b6b4524295.
This commit is contained in:
Marisa the Magician 2021-05-17 18:55:55 +02:00
commit 6fc5b96568
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/flakcannon.zsc
View file

@ -246,7 +246,7 @@ Class FlakChunk : Actor
if ( lifetics > 3 ) if ( lifetics > 3 )
{ {
lifetics = 0; lifetics = 0;
if ( frame < 11 ) frame += 1; if ( frame < 11 ) frame++;
} }
lifetime += lifespeed; lifetime += lifespeed;
if ( (waterlevel <= 0) && (frame < 10) && !(lifetics%2) ) if ( (waterlevel <= 0) && (frame < 10) && !(lifetics%2) )

2
zscript/pulsegun.zsc
View file

@ -525,7 +525,7 @@ Class StarterBolt : PulseBolt
SetOrigin(origin,true); SetOrigin(origin,true);
A_SetAngle(target.angle); A_SetAngle(target.angle);
A_SetPitch(target.BulletSlope()); A_SetPitch(target.BulletSlope());
frame += 1; frame++;
if ( frame > 4 ) frame = 0; if ( frame > 4 ) frame = 0;
CheckBeam((cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch))); CheckBeam((cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)));
} }

2
zscript/warheadlauncher.zsc
View file

@ -54,7 +54,7 @@ Class ShockWave : Actor
if ( !t ) t = ThinkerIterator.Create("Actor"); if ( !t ) t = ThinkerIterator.Create("Actor");
icount++; icount++;
if ( icount == 4 ) Spawn("WarheadSubExplosion",pos); if ( icount == 4 ) Spawn("WarheadSubExplosion",pos);
lifespan -= 1; lifespan--;
alpha -= 1./ReactionTime; alpha -= 1./ReactionTime;
shocksize = 13*(ReactionTime-lifespan)+3.5/(lifespan/ReactionTime+0.05); shocksize = 13*(ReactionTime-lifespan)+3.5/(lifespan/ReactionTime+0.05);
A_SetScale(shocksize*0.25); A_SetScale(shocksize*0.25);