summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-03 12:32:56 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:04 +0000
commitf44fffabb6f7e8dcf701adbd6d379cd4620a7f37 (patch)
treeddc26b28bc9d1a34d620ef161be83eeb19be8a4b /src/cgame
parentb606a25e8c414983faf6ffc49c53822f3c07a960 (diff)
* (bug 3964) Fix votedisplaystrings printing as blank in some circumstances (thanks Rezyn for 1/2 of this fix)
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 1844cdf0..6fe7655d 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1788,6 +1788,15 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
// get the gamestate from the client system
trap_GetGameState( &cgs.gameState );
+ // copy vote display strings so they don't show up blank if we see
+ // the same one directly after connecting
+ Q_strncpyz( cgs.voteString, CG_ConfigString( CS_VOTE_STRING ),
+ sizeof( cgs.voteString ) );
+ Q_strncpyz( cgs.teamVoteString[ 0 ], CG_ConfigString( CS_TEAMVOTE_STRING + 0 ),
+ sizeof( cgs.teamVoteString[ 0 ] ) );
+ Q_strncpyz( cgs.teamVoteString[ 1 ], CG_ConfigString( CS_TEAMVOTE_STRING + 1 ),
+ sizeof( cgs.teamVoteString[ 1 ] ) );
+
// check version
s = CG_ConfigString( CS_GAME_VERSION );