zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed portal restoration on revisiting level in hub

Browse source 
Added function to FLevelLocals to test if map is being reentered

https://forum.zdoom.org/viewtopic.php?t=60455
This commit is contained in:
alexey.lysiuk 2018-06-11 11:55:49 +03:00
parent bd1525eb9d
commit 29d2e77840
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_levellocals.h
View file

@ -183,6 +183,12 @@ struct FLevelLocals
return headgamenode; return headgamenode;
} }
// Returns true if level is loaded from saved game or is being revisited as a part of a hub
bool IsReentering() const
{
return savegamerestore
|| (info != nullptr && info->Snapshot.mBuffer != nullptr && info->isValid());
}
}; };
extern FLevelLocals level; extern FLevelLocals level;

2
src/p_setup.cpp
View file

@ -4127,7 +4127,7 @@ void P_SetupLevel (const char *lumpname, int position)
times[16].Clock(); times[16].Clock();
if (reloop) P_LoopSidedefs (false); if (reloop) P_LoopSidedefs (false);
PO_Init (); // Initialize the polyobjs PO_Init (); // Initialize the polyobjs
if (!savegamerestore) if (!level.IsReentering())
P_FinalizePortals(); // finalize line portals after polyobjects have been initialized. This info is needed for properly flagging them. P_FinalizePortals(); // finalize line portals after polyobjects have been initialized. This info is needed for properly flagging them.
times[16].Unclock(); times[16].Unclock();

2
src/s_sound.cpp
View file

@ -470,7 +470,7 @@ void S_Start ()
// Don't start the music if loading a savegame, because the music is stored there. // Don't start the music if loading a savegame, because the music is stored there.
// Don't start the music if revisiting a level in a hub for the same reason. // Don't start the music if revisiting a level in a hub for the same reason.
if (!savegamerestore && (level.info == nullptr || level.info->Snapshot.mBuffer == nullptr || !level.info->isValid())) if (!level.IsReentering())
{ {
if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid)) if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid))
S_ChangeMusic (level.Music, level.musicorder); S_ChangeMusic (level.Music, level.musicorder);