diff options
| author | M. Kristall <mkpdev@gmail.com> | 2009-10-09 07:41:45 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:44 +0000 |
| commit | 5d14c5b22672683dfd762e2c61f514ef8ef1aacd (patch) | |
| tree | 1b2719c49ba638fb854cd113ca6c4d9fbeb69b50 /src/cgame/cg_main.c | |
| parent | b5381f86afd9646f155eab40c83a902866b77849 (diff) | |
* Massive refactor of voting code
* Remove cvar g_suddenDeath since it is no longer needed
* "Sudden Death in 0 seconds!" should no longer display on map start when sudden
death is disabled
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 68a34159..01c24579 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -1763,12 +1763,15 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) // 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 ), + Q_strncpyz( cgs.voteString[ TEAM_NONE ], + CG_ConfigString( CS_VOTE_STRING + TEAM_NONE ), 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 ] ) ); + Q_strncpyz( cgs.voteString[ TEAM_ALIENS ], + CG_ConfigString( CS_VOTE_STRING + TEAM_ALIENS ), + sizeof( cgs.voteString[ TEAM_ALIENS ] ) ); + Q_strncpyz( cgs.voteString[ TEAM_HUMANS ], + CG_ConfigString( CS_VOTE_STRING + TEAM_ALIENS ), + sizeof( cgs.voteString[ TEAM_HUMANS ] ) ); // check version s = CG_ConfigString( CS_GAME_VERSION ); |