From 74a5a7021597c4f752830171271aea36cb1ebcd7 Mon Sep 17 00:00:00 2001 From: Teetime Date: Fri, 14 Oct 2011 00:16:18 +0200 Subject: removed sv_allow_join = 0 --- src/game/server/gamemodes/zcatch.cpp | 29 ++++++++++------------------- src/game/server/gamemodes/zcatch.hpp | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) (limited to 'src/game/server/gamemodes') diff --git a/src/game/server/gamemodes/zcatch.cpp b/src/game/server/gamemodes/zcatch.cpp index 4adae44c..f9477bdc 100644 --- a/src/game/server/gamemodes/zcatch.cpp +++ b/src/game/server/gamemodes/zcatch.cpp @@ -82,10 +82,7 @@ void CGameController_zCatch::StartRound() for(int i=0; im_apPlayers[i]) - { - if(GameServer()->m_apPlayers[i]->m_SpecExplicit == 0 || GameServer()->m_apPlayers[i]->m_CatchedBy == ZCATCH_JOINED_NEW) - GameServer()->m_apPlayers[i]->SetTeamDirect(GameServer()->m_pController->ClampTeam(1)); - + { GameServer()->m_apPlayers[i]->m_CatchedBy = ZCATCH_NOT_CATCHED; GameServer()->m_apPlayers[i]->m_Kills = 0; GameServer()->m_apPlayers[i]->m_Deaths = 0; @@ -133,27 +130,21 @@ void CGameController_zCatch::EndRound() { if(GameServer()->m_apPlayers[i]) { - - if(GameServer()->m_apPlayers[i]->m_CatchedBy == ZCATCH_JOINED_NEW) //Neue Spieler joinen lassen - GameServer()->m_apPlayers[i]->m_SpecExplicit = 0; - + if(GameServer()->m_apPlayers[i]->m_SpecExplicit == 0) { GameServer()->m_apPlayers[i]->SetTeamDirect(GameServer()->m_pController->ClampTeam(1)); GameServer()->m_pController->OnPlayerInfoChange(GameServer()->m_apPlayers[i]); - if(GameServer()->m_apPlayers[i]->m_CatchedBy != ZCATCH_JOINED_NEW) + char abuf[128]; + str_format(abuf, sizeof(abuf), "Kills: %d | Deaths: %d", GameServer()->m_apPlayers[i]->m_Kills, GameServer()->m_apPlayers[i]->m_Deaths); + GameServer()->SendChatTarget(i, abuf); + + if(GameServer()->m_apPlayers[i]->m_TicksSpec != 0 || GameServer()->m_apPlayers[i]->m_TicksIngame != 0) { - char abuf[128]; - str_format(abuf, sizeof(abuf), "Kills: %d | Deaths: %d", GameServer()->m_apPlayers[i]->m_Kills, GameServer()->m_apPlayers[i]->m_Deaths); - GameServer()->SendChatTarget(i, abuf); - - if(GameServer()->m_apPlayers[i]->m_TicksSpec != 0 || GameServer()->m_apPlayers[i]->m_TicksIngame != 0) - { - double TimeInSpec = (GameServer()->m_apPlayers[i]->m_TicksSpec*100.0) / (GameServer()->m_apPlayers[i]->m_TicksIngame + GameServer()->m_apPlayers[i]->m_TicksSpec); - str_format(abuf, sizeof(abuf), "Spec: %.2f%% | Ingame: %.2f%%", (double)TimeInSpec, (double)(100.0 - TimeInSpec)); - GameServer()->SendChatTarget(i, abuf); - } + double TimeInSpec = (GameServer()->m_apPlayers[i]->m_TicksSpec*100.0) / (GameServer()->m_apPlayers[i]->m_TicksIngame + GameServer()->m_apPlayers[i]->m_TicksSpec); + str_format(abuf, sizeof(abuf), "Spec: %.2f%% | Ingame: %.2f%%", (double)TimeInSpec, (double)(100.0 - TimeInSpec)); + GameServer()->SendChatTarget(i, abuf); } GameServer()->m_apPlayers[i]->m_CatchedBy = ZCATCH_NOT_CATCHED; //Set all players in server as non-catched } diff --git a/src/game/server/gamemodes/zcatch.hpp b/src/game/server/gamemodes/zcatch.hpp index 7615c523..bf8b026b 100644 --- a/src/game/server/gamemodes/zcatch.hpp +++ b/src/game/server/gamemodes/zcatch.hpp @@ -16,7 +16,6 @@ class CGameController_zCatch : public IGameController enum { - ZCATCH_JOINED_NEW = -2, ZCATCH_NOT_CATCHED = -1, }; -- cgit 1.4.1