- Added scoreboard fix by Karate Chris.

SVN r671 (trunk)
This commit is contained in:
Christoph Oelckers 2008-01-06 11:46:01 +00:00
parent fdbd18c50e
commit d7add9ce76
3 changed files with 6 additions and 5 deletions

View file

@ -1,4 +1,5 @@
January 6, 2008 (Changes by Graf Zahl) January 6, 2008 (Changes by Graf Zahl)
- Added scoreboard fix by Karate Chris.
- Added teamgame fix for menu by Karate Chris. - Added teamgame fix for menu by Karate Chris.
- Added GZDoom's Sector_Outside sector type which forces outside fog - Added GZDoom's Sector_Outside sector type which forces outside fog
regardless of ceiling texture. regardless of ceiling texture.

View file

@ -249,9 +249,6 @@ void CT_Drawer (void)
} }
if (players[consoleplayer].camera != NULL && if (players[consoleplayer].camera != NULL &&
((deathmatch && teamplay && sb_teamdeathmatch_enable) ||
(deathmatch && !teamplay && sb_deathmatch_enable) ||
(!deathmatch && multiplayer && sb_cooperative_enable)) &&
(Button_ShowScores.bDown || (Button_ShowScores.bDown ||
players[consoleplayer].camera->health <= 0)) players[consoleplayer].camera->health <= 0))
{ {

View file

@ -114,7 +114,7 @@ void HU_DrawScores (player_t *player)
} }
else else
{ {
if (!sb_cooperative_enable) if (!sb_cooperative_enable || !multiplayer)
return; return;
} }
@ -308,7 +308,10 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int x, int y, int h
if (teamplay && deathmatch) if (teamplay && deathmatch)
{ {
color = teams[player->userinfo.team].GetTextColor (); if (TEAMINFO_IsValidTeam (player->userinfo.team))
color = teams[player->userinfo.team].GetTextColor ();
else
color = CR_GREY;
} }
else else
{ {