diff --git a/src/g_level.cpp b/src/g_level.cpp index 24e7ad23e..7a166dbc4 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -452,16 +452,6 @@ void G_InitNew (const char *mapname, bool bTitleLevel) ST_CreateStatusBar(bTitleLevel); setsizeneeded = true; - if (gameinfo.gametype == GAME_Strife || (SBarInfoScript[SCRIPT_CUSTOM] != NULL && SBarInfoScript[SCRIPT_CUSTOM]->GetGameType() == GAME_Strife)) - { - // Set the initial quest log text for Strife. - for (i = 0; i < MAXPLAYERS; ++i) - { - if (playeringame[i]) - players[i].SetLogText ("$TXT_FINDHELP"); - } - } - // [RH] If this map doesn't exist, bomb out if (!P_CheckMapData(mapname)) { @@ -522,6 +512,16 @@ void G_InitNew (const char *mapname, bool bTitleLevel) } G_DoLoadLevel (0, false, !savegamerestore); + + if (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) + { + if (playeringame[i]) + players[i].SetLogText("$TXT_FINDHELP"); + } + } } // diff --git a/src/p_user.cpp b/src/p_user.cpp index 080de8c8e..8ff1eea0a 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -448,11 +448,11 @@ void player_t::SetLogText (const char *text) { LogText = text; - if (mo->CheckLocalView(consoleplayer)) + if (mo && mo->CheckLocalView(consoleplayer)) { // Print log text to console AddToConsole(-1, TEXTCOLOR_GOLD); - AddToConsole(-1, GStrings(LogText)); + AddToConsole(-1, LogText[0] == '$'? GStrings(LogText.GetChars()+1) : LogText.GetChars() ); AddToConsole(-1, "\n"); } }