From 8cb62eeca5515552d8d9745ea9356291697792a0 Mon Sep 17 00:00:00 2001 From: Nev3r Date: Wed, 2 Jun 2021 10:57:57 +0200 Subject: [PATCH] Initialize slopes before the map loads. --- src/p_setup.c | 2 ++ src/p_slopes.c | 10 +++++++--- src/p_slopes.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 51d2f474d..aa22fed86 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4274,6 +4274,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) P_MapStart(); // tmthing can be used starting from this point + P_InitSlopes(); + if (!P_LoadMapFromFile()) return false; diff --git a/src/p_slopes.c b/src/p_slopes.c index 4e93e4a45..9ce5af838 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -635,9 +635,6 @@ pslope_t *P_SlopeById(UINT16 id) void P_SpawnSlopes(const boolean fromsave) { size_t i; - slopelist = NULL; - slopecount = 0; - /// Generates vertex slopes. SpawnVertexSlopes(); @@ -671,6 +668,13 @@ void P_SpawnSlopes(const boolean fromsave) { } } +/// Initializes slopes. +void P_InitSlopes(void) +{ + slopelist = NULL; + slopecount = 0; +} + // ============================================================================ // // Various utilities related to slopes diff --git a/src/p_slopes.h b/src/p_slopes.h index ae040ae56..f627cae70 100644 --- a/src/p_slopes.h +++ b/src/p_slopes.h @@ -50,6 +50,7 @@ typedef enum void P_LinkSlopeThinkers (void); void P_CalculateSlopeNormal(pslope_t *slope); +void P_InitSlopes(void); void P_SpawnSlopes(const boolean fromsave); //