zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 01:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Applied Karate Chris's TEAMINFO logo patch.

Browse source 
SVN r690 (trunk)
This commit is contained in:
Randy Heit 2008-01-11 00:22:52 +00:00
parent a5265c4ec5
commit 756be2755a
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,3 +1,6 @@
January 10, 2008
- Applied Karate Chris's TEAMINFO logo patch.
January 10, 2008 (Changes by Graf Zahl) January 10, 2008 (Changes by Graf Zahl)
- defined a constant for the crosshair menu entry's index to get a direct - defined a constant for the crosshair menu entry's index to get a direct
reference out of the function code. In GZDoom the menu contains different reference out of the function code. In GZDoom the menu contains different

8
src/hu_scores.cpp
View file

@ -4,7 +4,7 @@
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
** Copyright 1998-2006 Randy Heit ** Copyright 1998-2006 Randy Heit
** Copyright 2007 Christopher Westley ** Copyright 2007-2008 Christopher Westley
** All rights reserved. ** All rights reserved.
** **
** Redistribution and use in source and binary forms, with or without ** Redistribution and use in source and binary forms, with or without
@ -329,6 +329,12 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int x, int y, int h
screen->DrawText (color, SCREENWIDTH / 2, y, player->userinfo.netname, screen->DrawText (color, SCREENWIDTH / 2, y, player->userinfo.netname,
DTA_CleanNoMove, true, TAG_DONE); DTA_CleanNoMove, true, TAG_DONE);
if (teamplay && teams[player->userinfo.team].logo.GetChars ())
{
screen->DrawTexture (TexMan[teams[player->userinfo.team].logo.GetChars ()], SCREENWIDTH / 5, y,
DTA_CleanNoMove, true, TAG_DONE);
}
if (player->mo->ScoreIcon > 0) if (player->mo->ScoreIcon > 0)
{ {
screen->DrawTexture (TexMan[player->mo->ScoreIcon], SCREENWIDTH / 2.25, y, screen->DrawTexture (TexMan[player->mo->ScoreIcon], SCREENWIDTH / 2.25, y,

8
src/teaminfo.cpp
View file

@ -3,7 +3,7 @@
** Implementation of the TEAMINFO lump. ** Implementation of the TEAMINFO lump.
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
** Copyright 2007 Christopher Westley ** Copyright 2007-2008 Christopher Westley
** All rights reserved. ** All rights reserved.
** **
** Redistribution and use in source and binary forms, with or without ** Redistribution and use in source and binary forms, with or without
@ -66,6 +66,7 @@ TArray <TEAMINFO> teams;
static const char *keywords_teaminfo [] = { static const char *keywords_teaminfo [] = {
"PLAYERCOLOR", "PLAYERCOLOR",
"TEXTCOLOR", "TEXTCOLOR",
"LOGO",
NULL NULL
}; };
@ -133,6 +134,11 @@ void TEAMINFO_ParseTeam ()
team.textcolor << sc_String << ']'; team.textcolor << sc_String << ']';
break; break;
case 2:
SC_MustGetString ();
team.logo = sc_String;
break;
default: default:
break; break;
} }

3
src/teaminfo.h
View file

@ -3,7 +3,7 @@
** Implementation of the TEAMINFO lump. ** Implementation of the TEAMINFO lump.
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
** Copyright 2007 Christopher Westley ** Copyright 2007-2008 Christopher Westley
** All rights reserved. ** All rights reserved.
** **
** Redistribution and use in source and binary forms, with or without ** Redistribution and use in source and binary forms, with or without
@ -43,6 +43,7 @@ struct TEAMINFO
int playercolor; int playercolor;
FString textcolor; FString textcolor;
int GetTextColor () const; int GetTextColor () const;
FString logo;
int players; int players;
int score; int score;
int present; int present;