From dd8acd4c61796e536feffb7d5dbdaae69bb3f2ab Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 18 Mar 2022 17:53:45 +0000 Subject: [PATCH] Initialize slopes before the map loads. # Conflicts: # src/p_setup.c # src/p_slopes.h --- src/p_setup.c | 3 +-- src/p_slopes.c | 10 +++++++--- src/p_slopes.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index eff56c21d..192313d9d 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4244,8 +4244,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) P_MapStart(); // tmthing can be used starting from this point - // init anything that P_SpawnSlopes/P_LoadThings needs to know - P_InitSpecials(); + P_InitSlopes(); //Initialize slopes before the map loads. if (!P_LoadMapFromFile()) return false; diff --git a/src/p_slopes.c b/src/p_slopes.c index 5c8abcc7f..f52158a34 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -684,9 +684,6 @@ pslope_t *P_SlopeById(UINT16 id) void P_SpawnSlopes(const boolean fromsave) { size_t i; - slopelist = NULL; - slopecount = 0; - /// Generates vertex slopes. SpawnVertexSlopes(); @@ -728,6 +725,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 ef8cb5886..c87208597 100644 --- a/src/p_slopes.h +++ b/src/p_slopes.h @@ -51,6 +51,7 @@ void P_LinkSlopeThinkers (void); void P_CalculateSlopeNormal(pslope_t *slope); void P_ReconfigureViaVertexes(pslope_t *slope, const vector3_t v1, const vector3_t v2, const vector3_t v3); +void P_InitSlopes(void); void P_SpawnSlopes(const boolean fromsave); //