From 2373a0aa8308816e2e6037fea736bf58a116b4dc Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 21 Jan 2020 16:47:47 -0800
Subject: [PATCH] Actually actually match the old behavior and check existing
levelflats in P_AddLevelFlatRuntime BRUH
---
src/p_setup.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index 9b5b7e5c29..1326841639 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -566,7 +566,7 @@ levelflat refers to an array of level flats,
or NULL if we want to allocate it now.
*/
static INT32
-Ploadflat (levelflat_t *levelflat, const char *flatname)
+Ploadflat (levelflat_t *levelflat, const char *flatname, boolean resize)
{
#ifndef NO_PNG_LUMPS
UINT8 buffer[8];
@@ -577,27 +577,26 @@ Ploadflat (levelflat_t *levelflat, const char *flatname)
size_t i;
- if (levelflat)
+ // Scan through the already found flats, return if it matches.
+ for (i = 0; i < numlevelflats; i++)
{
- // Scan through the already found flats, return if it matches.
- for (i = 0; i < numlevelflats; i++)
- {
- if (strnicmp(levelflat[i].name, flatname, 8) == 0)
- return i;
- }
-
- if (numlevelflats >= MAXLEVELFLATS)
- I_Error("Too many flats in level\n");
+ if (strnicmp(levelflat[i].name, flatname, 8) == 0)
+ return i;
}
- if (levelflat)
- levelflat += numlevelflats;
- else
+ if (resize)
{
// allocate new flat memory
levelflats = Z_Realloc(levelflats, (numlevelflats + 1) * sizeof(*levelflats), PU_LEVEL, NULL);
levelflat = levelflats + numlevelflats;
}
+ else
+ {
+ if (numlevelflats >= MAXLEVELFLATS)
+ I_Error("Too many flats in level\n");
+
+ levelflat += numlevelflats;
+ }
// Store the name.
strlcpy(levelflat->name, flatname, sizeof (levelflat->name));
@@ -663,7 +662,7 @@ flatfound:
// allocate an id for it, and set the levelflat (to speedup search)
INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
{
- return Ploadflat(levelflat, flatname);
+ return Ploadflat(levelflat, flatname, false);
}
// help function for Lua and $$$.sav reading
@@ -672,7 +671,7 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
//
INT32 P_AddLevelFlatRuntime(const char *flatname)
{
- return Ploadflat(0, flatname);
+ return Ploadflat(levelflats, flatname, true);
}
// help function for $$$.sav checking
--
GitLab