incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Terrain loading the same as other texture related things such as brightmaps

Browse source
This commit is contained in:
NepDisk 2024-09-19 21:44:34 -04:00
parent ca85f4f94e
commit 80a40bf91f
4 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_terrain.c
View file

@ -2207,11 +2207,11 @@ static boolean K_TERRAINLumpParser(char *data, size_t size)
}
/*--------------------------------------------------
void K_InitTerrain(UINT16 wadNum)
void K_InitTerrainPwad(UINT16 wadNum)
See header file for description.
--------------------------------------------------*/
boolean K_InitTerrain(UINT16 wadNum)
boolean K_InitTerrainPwad(UINT16 wadNum)
{
UINT16 lumpNum;
lumpinfo_t *lump_p = wadfiles[wadNum]->lumpinfo;
@ -2272,3 +2272,18 @@ boolean K_InitTerrain(UINT16 wadNum)
return terrainLoaded;
}
/*--------------------------------------------------
void K_InitTerrain(void)
See header file for description.
--------------------------------------------------*/
void K_InitTerrain(void)
{
INT32 wadNum;
for (wadNum = 0; wadNum < numwadfiles; wadNum++)
{
K_InitTerrainPwad(wadNum);
}
}

12
src/k_terrain.h
View file

@ -567,7 +567,7 @@ void K_UpdateTerrainOverlay(mobj_t *mo);
/*--------------------------------------------------
void K_InitTerrain(UINT16 wadNum);
void K_InitTerrainPwad(UINT16 wadNum);
Finds the TERRAIN lumps in a WAD/PK3, and
processes all of them.
@ -580,6 +580,14 @@ void K_UpdateTerrainOverlay(mobj_t *mo);
terrainLoaded - Terrain was loaded
--------------------------------------------------*/
boolean K_InitTerrain(UINT16 wadNum);
boolean K_InitTerrainPwad(UINT16 wadNum);
/*--------------------------------------------------
void K_InitTerrain(void);
Finds all TERRAIN lumps and processes them.
--------------------------------------------------*/
void K_InitTerrain(void);
#endif // __K_TERRAIN_H__

2
src/p_setup.c
View file

@ -8489,7 +8489,7 @@ UINT16 P_PartialAddWadFile(const char *wadfilename)
K_InitBrightmapsPwad(wadnum);
// Reload TERRAIN
if (K_InitTerrain(wadnum))
if (K_InitTerrainPwad(wadnum))
partadd_terrainloaded = true;
//

5
src/r_data.c
View file

@ -14,6 +14,7 @@
#include "doomdef.h"
#include "g_game.h"
#include "i_video.h"
#include "k_terrain.h"
#include "r_local.h"
#include "r_sky.h"
#include "p_local.h"
@ -1179,6 +1180,10 @@ void R_InitTextureData(void)
CONS_Printf("K_InitBrightmaps()...\n");
K_InitBrightmaps();
CONS_Printf("K_InitTerrain()...\n");
K_InitTerrain();
}
//