From 5e8e08ad95fa0dd4340f62d459ea94f96c4a3056 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Tue, 8 Jan 2019 20:14:58 -0500 Subject: [PATCH] Misc level init fixes --- src/p_setup.c | 6 ++++-- src/p_spec.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 2e26404e..b9554822 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2265,8 +2265,10 @@ static void P_LevelInitStuff(void) leveltime = 0; - localaiming = 0; - localaiming2 = 0; + localaiming = localaiming2 = localaiming3 = localaiming4 = 0; + + // map object scale + mapobjectscale = mapheaderinfo[gamemap-1]->mobj_scale; // special stage tokens, emeralds, and ring total tokenbits = 0; diff --git a/src/p_spec.c b/src/p_spec.c index 35d26c6c..b3ed61bc 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5717,8 +5717,6 @@ void P_SpawnSpecials(INT32 fromnetsave) else curWeather = PRECIP_NONE; - mapobjectscale = mapheaderinfo[gamemap-1]->mobj_scale; - P_InitTagLists(); // Create xref tables for tags P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line