diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2010-12-07 18:32:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:47 +0000 |
| commit | 419fef4d61933c1b4cb01d3bfe3f9a62496bec7b (patch) | |
| tree | 3748870a0a0594917500b2675d1018811e4306f7 /src/cgame/cg_draw.c | |
| parent | 8335ff2bc4ccf1a5f54e2ce0015684746c8a48a9 (diff) | |
* (bug 4817) Print cgame vote display on multiple lines
Diffstat (limited to 'src/cgame/cg_draw.c')
| -rw-r--r-- | src/cgame/cg_draw.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 7d548b82..2b6dbd27 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -3158,6 +3158,7 @@ static void CG_DrawVote( team_t team ) { char *s; int sec; + int offset = 0; vec4_t white = { 1.0f, 1.0f, 1.0f, 1.0f }; char yeskey[ 32 ] = "", nokey[ 32 ] = ""; @@ -3184,12 +3185,24 @@ static void CG_DrawVote( team_t team ) CG_KeyBinding( va( "%svote no", team == TEAM_NONE ? "" : "team" ) ) ); } - s = va( "%sVOTE(%i): \"%s" S_COLOR_WHITE "\" called by \"%s" - S_COLOR_WHITE "\" %sYes:%i %sNo:%i", - team == TEAM_NONE ? "" : "TEAM", sec, - cgs.voteString[ team ], cgs.voteCaller[ team ], + if( team != TEAM_NONE ) + offset = 80; + + s = va( "%sVOTE(%i): %s", + team == TEAM_NONE ? "" : "TEAM", sec, cgs.voteString[ team ] ); + + UI_Text_Paint( 8, 300 + offset, 0.3f, white, s, 0, 0, + ITEM_TEXTSTYLE_NORMAL ); + + s = va( " Called by: \"%s\"", cgs.voteCaller[ team ] ); + + UI_Text_Paint( 8, 320 + offset, 0.3f, white, s, 0, 0, + ITEM_TEXTSTYLE_NORMAL ); + + s = va( " %sYes:%i %sNo:%i", yeskey, cgs.voteYes[ team ], nokey, cgs.voteNo[ team ] ); - UI_Text_Paint( 8, team == TEAM_NONE ? 340 : 360, 0.3f, white, s, 0, 0, + + UI_Text_Paint( 8, 340 + offset, 0.3f, white, s, 0, 0, ITEM_TEXTSTYLE_NORMAL ); } |