OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into new_level_refactor

Browse source 
# Conflicts:
#	src/g_level.cpp
#	src/p_user.cpp
This commit is contained in:
Christoph Oelckers 2019-02-05 13:49:07 +01:00
commit 979f1df281
10 changed files with 89 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/g_level.cpp
View file

@ -166,7 +166,7 @@ extern bool sendpause, sendsave, sendturn180, SendLand;
void *statcopy; // for statistics driver
FLevelLocals level; // info about current level
FLevelLocals level; // info about current level
FLevelLocals *primaryLevel = &level; // level for which to display the user interface.
FLevelLocals *currentVMLevel = &level; // level which currently ticks. Used as global input to the VM and some functions called by it.
@ -543,7 +543,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
G_DoLoadLevel (mapname, 0, false, !savegamerestore);
if (gameinfo.gametype == GAME_Strife || (SBarInfoScript[SCRIPT_CUSTOM] != nullptr && SBarInfoScript[SCRIPT_CUSTOM]->GetGameType() == GAME_Strife))
if (!savegamerestore && (gameinfo.gametype == GAME_Strife || (SBarInfoScript[SCRIPT_CUSTOM] != nullptr && SBarInfoScript[SCRIPT_CUSTOM]->GetGameType() == GAME_Strife)))
{
// Set the initial quest log text for Strife.
for (i = 0; i < MAXPLAYERS; ++i)
@ -754,7 +754,7 @@ void FLevelLocals::SecretExitLevel (int position)
//
//==========================================================================
void G_DoCompleted (void)
void G_DoCompleted (void)
{
gameaction = ga_nothing;
@ -1026,7 +1026,7 @@ void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool au
if (isPrimaryLevel())
{
FString mapname = nextmapname;
mapname.ToLower();
mapname.ToLower();
Printf(
"\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
"\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n"