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

# 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

View file

@ -404,7 +404,7 @@ void player_t::SetLogText (const char *text)
{
// Print log text to console
AddToConsole(-1, TEXTCOLOR_GOLD);
AddToConsole(-1, LogText[0] == '$'? GStrings(LogText.GetChars()+1) : LogText.GetChars() );
AddToConsole(-1, LogText[0] == '$'? GStrings(text+1) : text );
AddToConsole(-1, "\n");
}
}