OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Revert all "global level removal" changes, as this concept is being discarded in GZDoom.

Browse source 
Keep a couple changes from that commit, though, such as the switch to legacy render style tags in Screen API calls.
This commit is contained in:
Marisa the Magician 2019-01-24 21:09:17 +01:00
commit ee0cf53e9b
16 changed files with 74 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/pulsegun.zsc
View file

@ -91,7 +91,7 @@ Class ViewPulseSpark : PulseSpark
Vector3 origin = x*ofs.x+y*ofs.y+z*ofs.z+(0,0,target.player.viewz);
SetOrigin(target.Vec2OffsetZ(origin.x,origin.y,origin.z),true);
bInvisible = (players[consoleplayer].camera != target);
if ( isFrozen() ) return;
if ( level.frozen || globalfreeze ) return;
ofs += vvel;
vvel *= 0.9;
scale *= 0.8;
@ -149,7 +149,7 @@ Class PulseExplLight : DynamicLight
override void Tick()
{
Super.Tick();
if ( isFrozen() ) return;
if ( globalfreeze || level.frozen ) return;
args[LIGHT_RED] = int(64*lifetime);
args[LIGHT_GREEN] = int(255*lifetime);
lifetime -= 1./ReactionTime;
@ -372,7 +372,7 @@ Class PulseBolt : Actor
{
if ( !damagedactor )
{
accdamage = min(0.5*(level.maptime-lasthit),0.1);
accdamage = min(0.5*(level.time-lasthit),0.1);
t.Results.HitActor.DamageMobj(self,target,int(Random[Pulse](80,100)*accdamage),'zapped',DMG_USEANGLE,atan2(x.y,x.x));
accdamage = 0;
}
@ -381,7 +381,7 @@ Class PulseBolt : Actor
t.Results.HitActor.DamageMobj(self,target,int(Random[Pulse](80,100)*accdamage),'zapped',DMG_USEANGLE,atan2(x.y,x.x));
accdamage = 0;
}
lasthit = level.maptime;
lasthit = level.time;
damagedactor = t.Results.HitActor;
accdamage += 1./TICRATE;
if ( accdamage > 0.17 )
@ -506,7 +506,7 @@ Class StarterBolt : PulseBolt
override void Tick()
{
Super.Tick();
if ( isFrozen() ) return;
if ( globalfreeze || level.frozen ) return;
if ( !target )
{
Destroy();