Merge branch 'master' into new_level_refactor

# Conflicts:
#	src/p_user.cpp
This commit is contained in:
Christoph Oelckers 2019-02-02 16:58:30 +01:00
commit 1dbbb56a1b
10 changed files with 14 additions and 8 deletions

View file

@ -490,7 +490,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
for (i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
players[i].SetLogText ("Find help");
players[i].SetLogText ("$TXT_FINDHELP");
}
}