From cdb841ef544f479cc4f9548e067f98d548987456 Mon Sep 17 00:00:00 2001
From: Yukita Mayako <catgirl@goddess.moe>
Date: Wed, 19 Oct 2016 03:22:11 -0400
Subject: [PATCH] Only P_InitPicAnims when wads are loaded.
Not in P_SetupLevel. That's just dumb.
---
src/p_setup.c | 7 +++----
src/r_data.c | 3 +++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index e56c44c706..f1d3a68c8e 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2587,10 +2587,6 @@ boolean P_SetupLevel(boolean skipprecip)
R_ReInitColormaps(mapheaderinfo[gamemap-1]->palette);
CON_ReSetupBackColormap(mapheaderinfo[gamemap-1]->palette);
- // now part of level loading since in future each level may have
- // its own anim texture sequences, switches etc.
- P_InitPicAnims();
-
// SRB2 determines the sky texture to be used depending on the map header.
P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true);
@@ -3001,6 +2997,9 @@ boolean P_AddWadFile(const char *wadfilename, char **firstmapname)
else
R_FlushTextureCache(); // just reload it from file
+ // Reload ANIMATED / ANIMDEFS
+ P_InitPicAnims();
+
// Flush and reload HUD graphics
ST_UnloadGraphics();
HU_LoadGraphics();
diff --git a/src/r_data.c b/src/r_data.c
index cb5cf35914..87b6b1193c 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1499,6 +1499,9 @@ void R_InitData(void)
CONS_Printf("R_LoadTextures()...\n");
R_LoadTextures();
+ CONS_Printf("P_InitPicAnims()...\n");
+ P_InitPicAnims();
+
CONS_Printf("R_InitSprites()...\n");
R_InitSpriteLumps();
R_InitSprites();
--
GitLab