OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Karate Chris's TEAMINFO submission.

Browse source 
SVN r610 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-20 20:22:31 +00:00
commit b48cc1792b
17 changed files with 1006 additions and 755 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/m_menu.cpp
View file

@ -65,6 +65,7 @@
#include "gi.h"
#include "p_tick.h"
#include "st_start.h"
#include "teaminfo.h"
// MACROS ------------------------------------------------------------------
@ -2078,8 +2079,8 @@ static void M_PlayerSetupDrawer ()
screen->DrawText (label, PSetupDef.x, PSetupDef.y + LINEHEIGHT+yo, "Team",
DTA_Clean, true, TAG_DONE);
screen->DrawText (value, x, PSetupDef.y + LINEHEIGHT+yo,
(unsigned)players[consoleplayer].userinfo.team >= NUM_TEAMS ? "None" :
TeamNames[players[consoleplayer].userinfo.team],
!TEAMINFO_IsValidTeam (players[consoleplayer].userinfo.team) ? "None" :
teams[players[consoleplayer].userinfo.team].name,
DTA_Clean, true, TAG_DONE);
// Draw player character
@ -2548,7 +2549,7 @@ static void M_ChangePlayerTeam (int choice)
}
else if (team == TEAM_None)
{
team = NUM_TEAMS-1;
team = teams.Size () - 1;
}
else
{
@ -2557,7 +2558,7 @@ static void M_ChangePlayerTeam (int choice)
}
else
{
if (team == NUM_TEAMS-1)
if (team == teams.Size () - 1)
{
team = TEAM_None;
}