From 73ea59179c064c6c2f8a5f0d0d2f0306dede23e0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 27 Jan 2019 14:48:35 +0100 Subject: [PATCH] - fixed some deprecation warnings about 'level'. --- wadsrc/static/zscript/shared/player.txt | 2 +- wadsrc/static/zscript/statscreen/statscreen.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt index cdcfccf13..5b5ffe06f 100644 --- a/wadsrc/static/zscript/shared/player.txt +++ b/wadsrc/static/zscript/shared/player.txt @@ -2765,7 +2765,7 @@ struct PlayerInfo native play // self is what internally is known as player_t return gamestate == GS_TITLELEVEL || (cheats & CF_TOTALLYFROZEN) || - (level.frozen && timefreezer == 0); + (mo && mo.Level.frozen && timefreezer == 0); } void Uncrouch() diff --git a/wadsrc/static/zscript/statscreen/statscreen.txt b/wadsrc/static/zscript/statscreen/statscreen.txt index a8d8e25ed..552f2112b 100644 --- a/wadsrc/static/zscript/statscreen/statscreen.txt +++ b/wadsrc/static/zscript/statscreen/statscreen.txt @@ -407,7 +407,7 @@ class StatusScreen abstract play version("2.5") //Added by mc 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) { 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! End(); - level.WorldDone(); + currentUILevel.WorldDone(); return; } @@ -614,7 +614,7 @@ class StatusScreen abstract play version("2.5") 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" // Use the local level structure which can be overridden by hubs - lnametexts[0] = level.LevelName; + lnametexts[0] = currentUILevel.LevelName; lnametexts[1] = wbstartstruct.nextname; bg = InterBackground.Create(wbs);