OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed DTA_Translation parameter for DrawTexture to an integer to avoid

Browse source 
passing renderer specific data to the function. Also added DTA_Font so
  that the renderer can fetch font translations from the proper font.
  DIM_MAP/ConShade had to be made a regular translation table to make it
  work.
- Added Karate Chris's fix for scoreboard displaying team play related data
  in non teamplay games.
- Fixed: The team selection menu didn't work.
- Fixed: UpdateTeam passed an FString to Printf.


SVN r623 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-23 14:13:29 +00:00
commit eb2e40cde0
19 changed files with 155 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/m_menu.cpp
View file

@ -2134,7 +2134,7 @@ static void M_PlayerSetupDrawer ()
(PSetupDef.y + LINEHEIGHT*3 + 57 - 104)*CleanYfac + (SCREENHEIGHT/2),
DTA_DestWidth, MulScale16 (tex->GetWidth() * CleanXfac, Scale),
DTA_DestHeight, MulScale16 (tex->GetHeight() * CleanYfac, Scale),
DTA_Translation, translationtables[TRANSLATION_Players] + 256 * MAXPLAYERS,
DTA_Translation, TRANSLATION(TRANSLATION_Players, 0),
TAG_DONE);
}
}
@ -2547,7 +2547,7 @@ static void M_ChangePlayerTeam (int choice)
{
team = TEAM_None;
}
else if (team == TEAM_None)
else if (!TEAMINFO_IsValidTeam (team))
{
team = teams.Size () - 1;
}
@ -2558,11 +2558,7 @@ static void M_ChangePlayerTeam (int choice)
}
else
{
if (team == teams.Size () - 1)
{
team = TEAM_None;
}
else if (team == TEAM_None)
if (!TEAMINFO_IsValidTeam (team))
{
team = 0;
}