OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into new_level_refactor

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

3
src/p_user.cpp
View file

@ -91,6 +91,7 @@
#include "events.h"
#include "g_game.h"
#include "v_video.h"
#include "gstrings.h"
static FRandom pr_skullpop ("SkullPop");
@ -403,7 +404,7 @@ void player_t::SetLogText (const char *text)
{
// Print log text to console
AddToConsole(-1, TEXTCOLOR_GOLD);
AddToConsole(-1, LogText);
AddToConsole(-1, GStrings(LogText));
AddToConsole(-1, "\n");
}
}