diff options
| author | oy <tom_adams@web.de> | 2012-01-29 03:33:16 -0800 |
|---|---|---|
| committer | oy <tom_adams@web.de> | 2012-01-29 03:33:16 -0800 |
| commit | 35f3944f4ad00730e8723bf2f1330ce4b26a1c19 (patch) | |
| tree | 810f22e6c85e0b22161fc6b821ada811e65fcbaa | |
| parent | 1a1b4a096a08c58fed357ee0c6afbc0e5218f7a8 (diff) | |
| parent | e359f82c697abdb10d199be96402aec1107ec801 (diff) | |
| download | zcatch-35f3944f4ad00730e8723bf2f1330ce4b26a1c19.tar.gz zcatch-35f3944f4ad00730e8723bf2f1330ce4b26a1c19.zip | |
Merge pull request #925 from SushiTee/minor_fixes
Minor fixes with force votes and lock teams
| -rw-r--r-- | src/game/server/gamecontext.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 87b9b3b7..5d2f22b8 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -33,6 +33,7 @@ void CGameContext::Construct(int Resetting) m_pVoteOptionFirst = 0; m_pVoteOptionLast = 0; m_NumVoteOptions = 0; + m_LockTeams = 0; if(Resetting==NO_RESET) m_pVoteOptionHeap = new CHeap(); @@ -1385,6 +1386,11 @@ void CGameContext::ConClearVotes(IConsole::IResult *pResult, void *pUserData) void CGameContext::ConVote(IConsole::IResult *pResult, void *pUserData) { CGameContext *pSelf = (CGameContext *)pUserData; + + // check if there is a vote running + if(!pSelf->m_VoteCloseTime) + return; + if(str_comp_nocase(pResult->GetString(0), "yes") == 0) pSelf->m_VoteEnforce = CGameContext::VOTE_ENFORCE_YES; else if(str_comp_nocase(pResult->GetString(0), "no") == 0) |