Minor tweaks

bradharding · Dec 20, 2024 · 2b6034b · 2b6034b
1 parent 63f3fef
commit 2b6034b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/r_data.c b/src/r_data.c
@@ -1093,13 +1093,16 @@ int R_TextureNumForName(const char *name)
 // to avoid using alloca(), and to improve performance.
 void R_PrecacheLevel(void)
 {
-    bool    *hitlist = calloc(MAX(numtextures, numflats), sizeof(bool));
+    bool    *hitlist = calloc(MAX(MAX(numsectors, numflats), MAX(numsides, numtextures)), sizeof(bool));
 
     // Precache flats.
     for (int i = 0; i < numsectors; i++)
     {
-        hitlist[sectors[i].floorpic] = true;
-        hitlist[sectors[i].ceilingpic] = true;
+        if (sectors[i].floorpic > -1)
+            hitlist[sectors[i].floorpic] = true;
+
+        if (sectors[i].ceilingpic > -1)
+            hitlist[sectors[i].ceilingpic] = true;
     }
 
     for (int i = 0; i < numflats; i++)

diff --git a/src/r_sky.c b/src/r_sky.c
@@ -77,8 +77,8 @@ static void PrepareFirePixels(fire_t *fire)
 
 static void SpreadFire(void)
 {
-    for (int x = 0; x < FIREWIDTH; ++x)
-        for (int y = 1; y < FIREHEIGHT; ++y)
+    for (int x = 0; x < FIREWIDTH; x++)
+        for (int y = 1; y < FIREHEIGHT; y++)
         {
             const int   src = y * FIREWIDTH + x;
             const int   index = fireindices[src];
@@ -179,8 +179,6 @@ void R_UpdateSky(void)
 
 void R_InitSkyMap(void)
 {
-    InitSkyDefs();
-
     skyflatnum = R_FlatNumForName(SKYFLATNAME);
     terraintypes[skyflatnum] = SKY;
     skytexture = P_GetMapSky1Texture(gameepisode, gamemap);
@@ -240,6 +238,8 @@ void R_InitSkyMap(void)
         }
     }
 
+    InitSkyDefs();
+
     skyscrolldelta = (vanilla ? 0 : (int)(P_GetMapSky1ScrollDelta(gameepisode, gamemap) * FRACUNIT));
 
     if (canfreelook)

diff --git a/src/wi_interlvl.c b/src/wi_interlvl.c
@@ -175,7 +175,7 @@ interlevel_t *WI_ParseInterlevel(const char *lumpname)
     cJSON               *js_layer = NULL;
     interlevellayer_t   *layers = NULL;
 
-        if (!(json = cJSON_ParseWithLength(W_CacheLumpNum(lumpnum), W_LumpLength(lumpnum)))
+    if (!(json = cJSON_ParseWithLength(W_CacheLumpNum(lumpnum), W_LumpLength(lumpnum)))
         || !cJSON_IsObject((data = cJSON_GetObjectItemCaseSensitive(json, "data")))
         || !cJSON_IsString((music = cJSON_GetObjectItemCaseSensitive(data, "music")))
         || !cJSON_IsString((backgroundimage = cJSON_GetObjectItemCaseSensitive(data, "backgroundimage"))))