zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch from Doom64hunter to address a couple of issues with per-map art

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8167 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/tiles.cpp
This commit is contained in:
terminx 2019-10-19 23:43:26 +00:00 committed by Christoph Oelckers
parent 8e088f6659
commit ad6d94b0f5
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/duke3d/src/savegame.cpp
View file

@ -34,6 +34,7 @@ BEGIN_DUKE_NS
static OutputFileCounter savecounter; static OutputFileCounter savecounter;
char previousboardfilename[BMAX_PATH];
// For storing pointers in files. // For storing pointers in files.
// back_p==0: ptr -> "small int" // back_p==0: ptr -> "small int"
@ -463,9 +464,13 @@ int32_t G_LoadPlayer(savebrief_t & sv)
else if (g_mapInfo[mapIdx].filename) else if (g_mapInfo[mapIdx].filename)
Bstrcpy(currentboardfilename, g_mapInfo[mapIdx].filename); Bstrcpy(currentboardfilename, g_mapInfo[mapIdx].filename);
if (currentboardfilename[0]) if (currentboardfilename[0])
{ {
artSetupMapArt(currentboardfilename); // only setup art if map differs from previous
if (!previousboardfilename[0] || previousboardfilename != currentboardfilename)
artSetupMapArt(currentboardfilename);
Bstrcpy(previousboardfilename, currentboardfilename);
append_ext_UNSAFE(currentboardfilename, ".mhk"); append_ext_UNSAFE(currentboardfilename, ".mhk");
engineLoadMHK(currentboardfilename); engineLoadMHK(currentboardfilename);
} }
@ -662,7 +667,10 @@ int32_t G_LoadPlayer(savebrief_t & sv)
if (currentboardfilename[0]) if (currentboardfilename[0])
{ {
artSetupMapArt(currentboardfilename); // only setup art if map differs from previous
if (!previousboardfilename[0] || Bstrcmp(previousboardfilename, currentboardfilename))
artSetupMapArt(currentboardfilename);
Bstrcpy(previousboardfilename, currentboardfilename);
append_ext_UNSAFE(currentboardfilename, ".mhk"); append_ext_UNSAFE(currentboardfilename, ".mhk");
engineLoadMHK(currentboardfilename); engineLoadMHK(currentboardfilename);
} }