OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/rheit/zdoom into z_osx_clean

Browse source
This commit is contained in:
alexey.lysiuk 2014-10-12 15:19:11 +03:00
commit 25b808cd82
36 changed files with 6457 additions and 5463 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ct_chat.cpp
View file

@ -281,7 +281,8 @@ void CT_Drawer (void)
if (players[consoleplayer].camera != NULL &&
(Button_ShowScores.bDown ||
players[consoleplayer].camera->health <= 0) &&
players[consoleplayer].camera->health <= 0 ||
SB_ForceActive) &&
// Don't draw during intermission, since it has its own scoreboard in wi_stuff.cpp.
gamestate != GS_INTERMISSION)
{