zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed some deprecation warnings about 'level'.

This commit is contained in:
Christoph Oelckers 2019-01-27 14:48:35 +01:00
parent 84baa5bb4d
commit 73ea59179c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wadsrc/static/zscript/shared/player.txt
View File

@ -2765,7 +2765,7 @@ struct PlayerInfo native play // self is what internally is known as player_t
return return
gamestate == GS_TITLELEVEL || gamestate == GS_TITLELEVEL ||
(cheats & CF_TOTALLYFROZEN) || (cheats & CF_TOTALLYFROZEN) ||
(level.frozen && timefreezer == 0); (mo && mo.Level.frozen && timefreezer == 0);
} }
void Uncrouch() void Uncrouch()

10
wadsrc/static/zscript/statscreen/statscreen.txt
View File

@ -407,7 +407,7 @@ class StatusScreen abstract play version("2.5")
//Added by mc //Added by mc
if (deathmatch) if (deathmatch)
{ {
level.RemoveAllBots (consoleplayer != Net_Arbitrator); currentUILevel.RemoveAllBots (consoleplayer != Net_Arbitrator);
} }
} }
@ -467,7 +467,7 @@ class StatusScreen abstract play version("2.5")
if (cnt == 0) if (cnt == 0)
{ {
End(); End();
level.WorldDone(); currentUILevel.WorldDone();
} }
} }
@ -483,7 +483,7 @@ class StatusScreen abstract play version("2.5")
{ {
// Last map in episode - there is no next location! // Last map in episode - there is no next location!
End(); End();
level.WorldDone(); currentUILevel.WorldDone();
return; return;
} }
@ -614,7 +614,7 @@ class StatusScreen abstract play version("2.5")
virtual void StartMusic() virtual void StartMusic()
{ {
level.SetInterMusic(wbs.next); currentUILevel.SetInterMusic(wbs.next);
} }
//==================================================================== //====================================================================
@ -712,7 +712,7 @@ class StatusScreen abstract play version("2.5")
Par = TexMan.CheckForTexture("WIPAR", TexMan.Type_MiscPatch); // "par" Par = TexMan.CheckForTexture("WIPAR", TexMan.Type_MiscPatch); // "par"
// Use the local level structure which can be overridden by hubs // Use the local level structure which can be overridden by hubs
lnametexts[0] = level.LevelName; lnametexts[0] = currentUILevel.LevelName;
lnametexts[1] = wbstartstruct.nextname; lnametexts[1] = wbstartstruct.nextname;
bg = InterBackground.Create(wbs); bg = InterBackground.Create(wbs);