diff --git a/zmapinfo.txt b/zmapinfo.txt index a7a49c4..958dc67 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -7,8 +7,3 @@ GameInfo BorderFlat = "TEMPBG" Border = 0,0,"","","","","","","","" } - -// titlemaps need a mapinfo entry in devbuilds -map TITLEMAP "UT Logo Map" -{ -} diff --git a/zscript.txt b/zscript.txt index 9147f59..e2ceb1f 100644 --- a/zscript.txt +++ b/zscript.txt @@ -1,4 +1,4 @@ -version "3.8" +version "3.7" #include "zscript/mk_matrix.zsc" #include "zscript/mk_coordutil.zsc" diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index 51e84b7..e78e576 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -158,7 +158,7 @@ Class BioXLight : 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); args[LIGHT_BLUE] = int(48*lifetime); @@ -211,7 +211,7 @@ Class BioGel : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( !bNOGRAVITY ) { roll += rollvel; @@ -608,7 +608,7 @@ Class BioGlob : BioGel override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); for ( int i=0; i<2; i++ ) { diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc index a099255..b5bbe21 100644 --- a/zscript/eightball.zsc +++ b/zscript/eightball.zsc @@ -428,7 +428,7 @@ Class UTRocketLauncher : UTWeapon // lock-on check action void A_CheckTarget() { - let t = level.CreateThinkerIterator("Actor"); + let t = ThinkerIterator.Create("Actor"); Actor a; double closest = double.max; invoker.LockedTarget = null; diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc index dfea801..8610c82 100644 --- a/zscript/enforcer.zsc +++ b/zscript/enforcer.zsc @@ -119,7 +119,7 @@ Class UTCasing : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; if ( InStateSequence(CurState,ResolveState("Death")) ) { deadtimer++; diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc index 1c43cbc..0b28847 100644 --- a/zscript/flakcannon.zsc +++ b/zscript/flakcannon.zsc @@ -55,7 +55,7 @@ Class ChunkLight : DynamicLight Destroy(); return; } - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(255*(10-target.frame)*0.1); args[LIGHT_GREEN] = int(224*(10-target.frame)*0.1); args[LIGHT_BLUE] = int(128*(10-target.frame)*0.1); @@ -84,7 +84,7 @@ Class ChunkTrail : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( InStateSequence(CurState,FindState("Death")) ) return; if ( !target ) { @@ -121,7 +121,7 @@ Class FlakAccumulator : Thinker static void Accumulate( Actor victim, int amount ) { - let ti = victim.level.CreateThinkerIterator("FlakAccumulator",STAT_USER); + let ti = ThinkerIterator.Create("FlakAccumulator",STAT_USER); FlakAccumulator a, match = null; while ( a = FlakAccumulator(ti.Next()) ) { @@ -131,7 +131,7 @@ Class FlakAccumulator : Thinker } if ( !match ) { - match = new("FlakAccumulator"); // another thinker created through new(), this all looks like a big catastrophe waiting to happen + match = new("FlakAccumulator"); match.ChangeStatNum(STAT_USER); match.victim = victim; } @@ -141,7 +141,7 @@ Class FlakAccumulator : Thinker static int GetAmount( Actor victim ) { - let ti = victim.level.CreateThinkerIterator("FlakAccumulator",STAT_USER); + let ti = ThinkerIterator.Create("FlakAccumulator",STAT_USER); FlakAccumulator a; while ( a = FlakAccumulator(ti.Next()) ) { @@ -193,7 +193,7 @@ Class FlakChunk : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( waterlevel > 0 ) { vel.xy *= 0.98; @@ -335,7 +335,7 @@ Class SlugSmoke : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; lifetime += lifespeed; let s = Spawn("UTSmoke",pos); s.vel = (FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5)); @@ -369,7 +369,7 @@ Class SlugLight : DynamicLight override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(255*lifetime); args[LIGHT_GREEN] = int(224*lifetime); args[LIGHT_BLUE] = int(128*lifetime); diff --git a/zscript/impacthammer.zsc b/zscript/impacthammer.zsc index bbe1956..81461dd 100644 --- a/zscript/impacthammer.zsc +++ b/zscript/impacthammer.zsc @@ -152,7 +152,7 @@ Class ImpactHammer : UTWeapon if ( d.HitType == TRACE_HitWall ) d.HitLine.RemoteActivate(self,d.LineSide,SPAC_Impact,d.HitLocation-d.HitDir*4); } // push aside projectiles - let t = level.CreateThinkerIterator("Actor"); + let t = ThinkerIterator.Create("Actor"); Actor m; while ( m = Actor(t.Next()) ) { diff --git a/zscript/minigun.zsc b/zscript/minigun.zsc index 084d6a1..35b6110 100644 --- a/zscript/minigun.zsc +++ b/zscript/minigun.zsc @@ -47,7 +47,7 @@ Class MinigunTracer : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; Vector3 dir = level.Vec3Diff(pos,dest); if ( dir.length() < 160 ) { diff --git a/zscript/mk_coordutil.zsc b/zscript/mk_coordutil.zsc index f61f2c3..709a425 100644 --- a/zscript/mk_coordutil.zsc +++ b/zscript/mk_coordutil.zsc @@ -9,7 +9,7 @@ Class dt_CoordUtil { // projects a world point onto screen // view matrix setup mostly pulled from gutawer's code - static Vector3 WorldToScreen( LevelLocals level, Vector3 vect, Vector3 eye, double pitch, double yaw, double roll, double vfov ) + static Vector3 WorldToScreen( Vector3 vect, Vector3 eye, double pitch, double yaw, double roll, double vfov ) { double ar = Screen.getWidth()/double(Screen.getHeight()); double fovr = (ar>=1.3)?1.333333:ar; diff --git a/zscript/pulsegun.zsc b/zscript/pulsegun.zsc index dc85f95..78add62 100644 --- a/zscript/pulsegun.zsc +++ b/zscript/pulsegun.zsc @@ -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(); diff --git a/zscript/ripper.zsc b/zscript/ripper.zsc index 53c53fe..a33dcd2 100644 --- a/zscript/ripper.zsc +++ b/zscript/ripper.zsc @@ -170,7 +170,7 @@ Class Razor2AltLight : DynamicLight override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(255*lifetime); args[LIGHT_GREEN] = int(240*lifetime); args[LIGHT_BLUE] = int(224*lifetime); diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc index dee5336..1247e97 100644 --- a/zscript/shockrifle.zsc +++ b/zscript/shockrifle.zsc @@ -72,7 +72,7 @@ Class ShockRifleWave : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; alpha -= 1/50.; } States @@ -99,7 +99,7 @@ Class SuperShockRifleWave : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; alpha -= 1/50.; } States @@ -127,7 +127,7 @@ Class ShockBeamRing : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; alpha -= 1./ReactionTime; } States @@ -154,7 +154,7 @@ Class SuperShockBeamRing : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; alpha -= 1./ReactionTime; } States @@ -295,7 +295,7 @@ Class ShockBeam : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( !moving ) return; // step trace tracedir = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); @@ -522,7 +522,7 @@ Class SuperShockBeam : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( !moving ) return; // step trace tracedir = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); @@ -765,7 +765,7 @@ Class ShockExplLight : DynamicLight override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(160*lifetime); args[LIGHT_GREEN] = int(128*lifetime); args[LIGHT_BLUE] = int(255*lifetime); @@ -791,7 +791,7 @@ Class SuperShockExplLight : DynamicLight override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(255*lifetime); args[LIGHT_GREEN] = int(160*lifetime); args[LIGHT_BLUE] = int(128*lifetime); @@ -982,7 +982,7 @@ Class ViewShockSpark : ShockSpark 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; diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc index bce107b..d69e941 100644 --- a/zscript/utcommon.zsc +++ b/zscript/utcommon.zsc @@ -213,7 +213,7 @@ Class UTPlayer : DoomPlayer } if ( !footsteps ) footsteps = CVar.GetCVar('flak_footsteps',players[consoleplayer]); if ( !footsteps.GetBool() ) return; - double ang = level.maptime/(20*TICRATE/35.)*360.; + double ang = level.time/(20*TICRATE/35.)*360.; bool forcefootstep = false; if ( player.onground && !bNoGravity && !lastground && (waterlevel < 2) ) { @@ -901,7 +901,7 @@ Class UTViewSpark : UTSpark 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.z -= 0.1; scale *= 0.8; @@ -943,7 +943,7 @@ Class UTChip : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; if ( InStateSequence(CurState,ResolveState("Death")) ) { deadtimer++; @@ -1006,7 +1006,7 @@ Class UTBubble : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; vel *= 0.96; vel.z += 0.05; if ( (waterlevel <= 0) || !Random[Puff](0,100) ) Destroy(); @@ -1054,7 +1054,7 @@ Class UTSmoke : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; vel *= 0.96; vel.z += 0.01; A_FadeOut(1/32.); @@ -1146,7 +1146,7 @@ Class UTViewSmoke : UTSmoke 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.96; vvel.z += 0.01; @@ -1545,7 +1545,7 @@ Class UTMainHandler : StaticEventHandler private Actor AddLight( Vector3 pos, Color col, int radius ) { - Actor l = currentSession.levelinfo[0].Spawn("PointLightAttenuated",pos); + Actor l = Actor.Spawn("PointLightAttenuated",pos); if ( !l ) return null; l.args[0] = col.r; l.args[1] = col.g; @@ -1556,7 +1556,7 @@ Class UTMainHandler : StaticEventHandler private Actor AddAmbient( Vector3 pos, String snd, double volume = 1., double attenuation = ATTN_NORM ) { - Actor a = currentSession.levelinfo[0].Spawn("MapSpot",pos); + Actor a = Actor.Spawn("MapSpot",pos); if ( !a ) return null; a.A_PlaySound(snd,CHAN_BODY,volume,true,attenuation); return a; @@ -1565,12 +1565,15 @@ Class UTMainHandler : StaticEventHandler override void WorldLoaded( WorldEvent e ) { if ( gamestate != GS_LEVEL || e.IsSaveGame ) return; - let level = currentSession.levelinfo[0]; - // just replace the -noflat- with a better scaled version + // just replace the -noflat- with a better scaled version and change the sky if ( !flak_doomtest ) { if ( (level.GetChecksum() ~== "FBC3B6622A8B74AE06DE01E70007AC33") || (level.GetChecksum() ~== "D8206A3414DA967F2159473B5791139E") ) + { level.ReplaceTextures("-noflat-","DefTex",0); + TextureID skytx = TexMan.CheckForTexture("BlueSky",TexMan.Type_Any); + level.ChangeSky(skytx,skytx); + } return; } // prettify Kinsie's test map for a more Unreal feel @@ -1871,7 +1874,7 @@ Class UTMainHandler : StaticEventHandler return; } // generic gibbing - let a = e.Thing.level.Spawn("UTGibber",e.Thing.pos); + let a = Actor.Spawn("UTGibber",e.Thing.pos); a.vel = e.Thing.vel; a.Scale = e.Thing.Scale; a.Translation = e.Thing.BloodTranslation; @@ -1886,7 +1889,7 @@ Class UTMainHandler : StaticEventHandler } // attach damage accumulator for corpses if ( !flak_corpsedamage ) return; - let a = e.Thing.level.Spawn("ShredCorpseHitbox",e.Thing.pos); + let a = Actor.Spawn("ShredCorpseHitbox",e.Thing.pos); a.target = e.Thing; } @@ -1911,7 +1914,7 @@ Class UTMainHandler : StaticEventHandler if ( !a || !a.bSHOOTABLE || !Source.CheckSight(a,0xf) || (a == Source) || (Source.Distance3D(a) > ExplosionRadius) ) continue; Vector3 midpoint = a.Vec3Offset(0,0,a.height*0.5); - a.vel += Source.level.Vec3Diff(Source.pos,midpoint).unit()*(MomentumTransfer/(Thinker.TICRATE*a.mass)); + a.vel += Level.Vec3Diff(Source.pos,midpoint).unit()*(MomentumTransfer/(Thinker.TICRATE*a.mass)); } } @@ -1925,7 +1928,7 @@ Class UTMainHandler : StaticEventHandler static void DoSwing( Actor target, Vector2 dir, double initial, double inc, int steps, int mode = 0, int delay = 0, double rmul = 1.0 ) { if ( !flak_swingers ) return; - let s = new("Swinger"); // this looks unsafe, shouldn't there be a way to create thinkers in specifc level? + let s = new("Swinger"); s.ChangeStatNum(Thinker.STAT_USER); s.target = target; s.dir = dir; diff --git a/zscript/utgore.zsc b/zscript/utgore.zsc index 18ba524..41179fa 100644 --- a/zscript/utgore.zsc +++ b/zscript/utgore.zsc @@ -155,7 +155,7 @@ Class UTBloodTrail : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; if ( !target ) return; SetOrigin(target.pos,true); double ang, pt; diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc index 23dd938..5282e09 100644 --- a/zscript/uthud.zsc +++ b/zscript/uthud.zsc @@ -401,7 +401,7 @@ Class UTHud : BaseStatusBar if ( CPlayer.mo.Health < CPlayer.mo.SpawnHealth()/2 ) { Color blinkcolor; - double blinky = ((currentsession.time+fractic)/Thinker.TICRATE)*1.5; + double blinky = ((level.time+fractic)/Thinker.TICRATE)*1.5; blinky = blinky-floor(blinky); blinkcolor = LerpColor(tintcolor,WhiteColor,blinky); UTDrawTintedTex(Boxes[2],hudsize,-1,blinkcolor); @@ -517,7 +517,7 @@ Class UTHud : BaseStatusBar CurY = Screen.GetHeight()-64*hudsize*HScale; if ( showweapons && ((weaponsize*hudsize)>=1.0) ) CurY -= 64*hudsize*HScale; DrawColor = tintcolor; - double whiten = ((currentsession.time+fractic)-lastfrag)/Thinker.TICRATE; + double whiten = ((level.time+fractic)-lastfrag)/Thinker.TICRATE; if ( whiten < 3.0 ) { if ( tintcolor == GoldColor ) @@ -539,7 +539,7 @@ Class UTHud : BaseStatusBar } private void DrawIdentifyInfo() { - double lalpha = 2.0-((currentsession.time+fractic)-lastseentic)/Thinker.TICRATE; + double lalpha = 2.0-((level.time+fractic)-lastseentic)/Thinker.TICRATE; if ( !lastseen || (lalpha <= 0) ) return; String cl1 = "Teal", cl2 = "Cyan"; if ( deathmatch && (lastseen.player.GetTeam() < teams.size()) ) @@ -613,19 +613,19 @@ Class UTHud : BaseStatusBar Super.Tick(); if ( deathmatch||teamplay ) { - if ( CPlayer.fragcount != lastfragcnt ) lastfrag = currentsession.time; + if ( CPlayer.fragcount != lastfragcnt ) lastfrag = level.time; lastfragcnt = CPlayer.fragcount; } else { - if ( CPlayer.killcount != lastfragcnt ) lastfrag = currentsession.time; + if ( CPlayer.killcount != lastfragcnt ) lastfrag = level.time; lastfragcnt = CPlayer.killcount; } vtracer.ignore = CPlayer.mo; vtracer.trace(CPlayer.mo.Vec2OffsetZ(0,0,CPlayer.viewz),CPlayer.mo.CurSector,(cos(CPlayer.mo.angle)*cos(CPlayer.mo.pitch),sin(CPlayer.mo.angle)*cos(CPlayer.mo.pitch),-sin(CPlayer.mo.pitch)),1000,0); if ( vtracer.Results.HitType != TRACE_HitActor ) return; lastseen = vtracer.Results.HitActor; - lastseentic = currentsession.time; + lastseentic = level.time; } private void DrawUTHUD() diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc index 1968dc6..a851d23 100644 --- a/zscript/warheadlauncher.zsc +++ b/zscript/warheadlauncher.zsc @@ -48,9 +48,9 @@ Class ShockWave : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( alpha <= 0 ) return; - if ( !t ) t = level.CreateThinkerIterator("Actor"); + if ( !t ) t = ThinkerIterator.Create("Actor"); icount++; if ( icount == 4 ) Spawn("WarheadSubExplosion",pos); lifespan--; @@ -164,7 +164,7 @@ Class WarheadExplodLight : DynamicLight override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; args[LIGHT_RED] = int(255*lifetime); args[LIGHT_GREEN] = int(192*lifetime); args[LIGHT_BLUE] = int(128*lifetime); @@ -224,7 +224,7 @@ Class WarheadTrail : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( level.frozen || globalfreeze ) return; vel *= 0.99; A_FadeOut(0.1); } @@ -275,7 +275,7 @@ Class WarShell : Actor override void Tick() { Super.Tick(); - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( !bMISSILE ) return; if ( vel.length() > 0 ) { @@ -375,7 +375,7 @@ Class GuidedWarShell : WarShell justleft = false; bHITOWNER = true; } - if ( isFrozen() ) return; + if ( globalfreeze || level.frozen ) return; if ( !bMISSILE ) return; if ( !target || !target.player || (target.Health <= 0) ) { @@ -482,7 +482,7 @@ Class RedeemerHUD : HUDMessageBase // shootable targetting if ( CVar.GetCVar('flak_redeemerreadout',players[consoleplayer]).GetBool() && !CVar.GetCVar('flak_redeemerreadout_perframe',players[consoleplayer]).GetBool() ) { - if ( !t ) t = camera.level.CreateThinkerIterator("Actor"); + if ( !t ) t = ThinkerIterator.Create("Actor"); if ( !tr ) tr = new("MidTracer"); t.Reinit(); ta.Clear(); @@ -490,10 +490,10 @@ Class RedeemerHUD : HUDMessageBase Vector3 vdir = (cos(ViewAngle)*cos(ViewPitch),sin(ViewAngle)*cos(ViewPitch),-sin(ViewPitch)); while ( a = Actor(t.Next()) ) { - Vector3 tdir = camera.level.Vec3Diff(ViewPos,a.Pos+(0,0,a.Height*0.5)); + Vector3 tdir = Level.Vec3Diff(ViewPos,a.Pos+(0,0,a.Height*0.5)); if ( !a.bSHOOTABLE || (a.Health <= 0) || ((Camera is 'GuidedWarShell') && (a == GuidedWarShell(Camera).b)) || (tdir.length() > 2000) || (acos(tdir.unit() dot vdir) > players[consoleplayer].FOV) || tr.Trace(ViewPos,Camera.CurSector,tdir.unit(),tdir.length(),0) ) continue; Vector3 wpos = ViewPos+tdir; - Vector3 spos = dt_CoordUtil.WorldToScreen(camera.level,wpos,ViewPos,ViewPitch,ViewAngle,ViewRoll,players[consoleplayer].FOV); + Vector3 spos = dt_CoordUtil.WorldToScreen(wpos,ViewPos,ViewPitch,ViewAngle,ViewRoll,players[consoleplayer].FOV); if ( spos.z > 1.0 ) continue; TargetActor te = new("TargetActor"); te.vpos = dt_CoordUtil.ToViewport(spos); @@ -513,7 +513,7 @@ Class RedeemerHUD : HUDMessageBase { if ( CVar.GetCVar('flak_redeemerreadout_perframe',players[consoleplayer]).GetBool() ) { - if ( !t ) t = camera.level.CreateThinkerIterator("Actor"); + if ( !t ) t = ThinkerIterator.Create("Actor"); if ( !tr ) tr = new("MidTracer"); t.Reinit(); ta.Clear(); @@ -521,10 +521,10 @@ Class RedeemerHUD : HUDMessageBase Vector3 vdir = (cos(ViewAngle)*cos(ViewPitch),sin(ViewAngle)*cos(ViewPitch),-sin(ViewPitch)); while ( a = Actor(t.Next()) ) { - Vector3 tdir = camera.level.Vec3Diff(ViewPos,a.Pos+(0,0,a.Height*0.5)); + Vector3 tdir = Level.Vec3Diff(ViewPos,a.Pos+(0,0,a.Height*0.5)); if ( !a.bSHOOTABLE || (a.Health <= 0) || ((Camera is 'GuidedWarShell') && (a == GuidedWarShell(Camera).b)) || (tdir.length() > 2000) || (acos(tdir.unit() dot vdir) > players[consoleplayer].FOV) || tr.Trace(ViewPos,Camera.CurSector,tdir.unit(),tdir.length(),0) ) continue; Vector3 wpos = ViewPos+tdir; - Vector3 spos = dt_CoordUtil.WorldToScreen(camera.level,wpos,ViewPos,ViewPitch,ViewAngle,ViewRoll,players[consoleplayer].FOV); + Vector3 spos = dt_CoordUtil.WorldToScreen(wpos,ViewPos,ViewPitch,ViewAngle,ViewRoll,players[consoleplayer].FOV); if ( spos.z > 1.0 ) continue; TargetActor te = new("TargetActor"); te.vpos = dt_CoordUtil.ToViewport(spos); @@ -535,8 +535,8 @@ Class RedeemerHUD : HUDMessageBase } for ( int i=0; i