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/g_statusbar/shared_sbar.cpp
View file

@ -55,6 +55,7 @@
#include "vm.h"
#include "p_acs.h"
#include "sbarinfo.h"
#include "gstrings.h"
#include "events.h"
#include "g_game.h"
@ -1046,7 +1047,7 @@ void DBaseStatusBar::DrawLog ()
hudheight = SCREENHEIGHT / scale;
int linelen = hudwidth<640? Scale(hudwidth,9,10)-40 : 560;
auto lines = V_BreakLines (SmallFont, linelen, CPlayer->LogText);
auto lines = V_BreakLines (SmallFont, linelen, GStrings(CPlayer->LogText));
int height = 20;
for (unsigned i = 0; i < lines.Size(); i++) height += SmallFont->GetHeight () + 1;