mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 18:50:47 +00:00
Patch from Doom64hunter to address a couple of issues with per-map art
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:
parent
8e088f6659
commit
ad6d94b0f5
1 changed files with 10 additions and 2 deletions
|
@ -34,6 +34,7 @@ BEGIN_DUKE_NS
|
|||
|
||||
|
||||
static OutputFileCounter savecounter;
|
||||
char previousboardfilename[BMAX_PATH];
|
||||
|
||||
// For storing pointers in files.
|
||||
// back_p==0: ptr -> "small int"
|
||||
|
@ -463,9 +464,13 @@ int32_t G_LoadPlayer(savebrief_t & sv)
|
|||
else if (g_mapInfo[mapIdx].filename)
|
||||
Bstrcpy(currentboardfilename, g_mapInfo[mapIdx].filename);
|
||||
|
||||
|
||||
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");
|
||||
engineLoadMHK(currentboardfilename);
|
||||
}
|
||||
|
@ -662,7 +667,10 @@ int32_t G_LoadPlayer(savebrief_t & sv)
|
|||
|
||||
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");
|
||||
engineLoadMHK(currentboardfilename);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue