From 5fb4698205040edc43c7e5aca89e4e2252604c20 Mon Sep 17 00:00:00 2001 From: Teetime Date: Sat, 12 Jan 2013 08:12:07 +0100 Subject: removed a feature which has been anyway used very rarely --- src/game/server/gamecontext.cpp | 13 ------------- src/game/server/gamemodes/zcatch.cpp | 3 +-- src/game/server/player.cpp | 1 - src/game/server/player.h | 1 - src/game/variables.h | 1 - 5 files changed, 1 insertion(+), 18 deletions(-) (limited to 'src/game') diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 7aa9c295..0b27960b 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -744,7 +744,6 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) SendChatTarget(ClientID, " "); SendChatTarget(ClientID, "/info or /about - see information about author."); SendChatTarget(ClientID, "/help - learn how to play."); - SendChatTarget(ClientID, "/follow 1 or /follow 0 - Enables/Disables following of the catcher."); } else if(!str_comp("/help", pMsg->m_pMessage)) { @@ -754,22 +753,10 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) SendChatTarget(ClientID, "So the only way to win is to kill every player without beeing killed."); SendChatTarget(ClientID, "Have fun!"); } - else if(!str_comp("/follow 0", pMsg->m_pMessage)) - { - pPlayer->m_PlayerWantToFollowCatcher = 0; - pPlayer->m_SpectatorID = SPEC_FREEVIEW; - SendChatTarget(ClientID, "Follow of catcher disabled."); - } - else if(!str_comp("/follow 1", pMsg->m_pMessage)) - { - pPlayer->m_PlayerWantToFollowCatcher = 1; - SendChatTarget(ClientID, "Follow of catcher enabled."); - } else if(!str_comp_num("/", pMsg->m_pMessage, 1)) SendChatTarget(ClientID, "Unknown command."); else SendChat(ClientID, Team, pMsg->m_pMessage); - /* end zCatch */ } else if(MsgID == NETMSGTYPE_CL_CALLVOTE) diff --git a/src/game/server/gamemodes/zcatch.cpp b/src/game/server/gamemodes/zcatch.cpp index 393f4511..30948d12 100644 --- a/src/game/server/gamemodes/zcatch.cpp +++ b/src/game/server/gamemodes/zcatch.cpp @@ -78,8 +78,7 @@ int CGameController_zCatch::OnCharacterDeath(class CCharacter *pVictim, class CP pVictim->GetPlayer()->m_CaughtBy = pKiller->GetCID(); pVictim->GetPlayer()->SetTeamDirect(TEAM_SPECTATORS); - if(pVictim->GetPlayer()->m_PlayerWantToFollowCatcher) - pVictim->GetPlayer()->m_SpectatorID = pKiller->GetCID(); // Let the victim follow his catcher + pVictim->GetPlayer()->m_SpectatorID = pKiller->GetCID(); // Let the victim follow his catcher char aBuf[256]; str_format(aBuf, sizeof(aBuf), "Caught by \"%s\". You will join the game automatically when \"%s\" dies.", Server()->ClientName(pKiller->GetCID()), Server()->ClientName(pKiller->GetCID())); diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 7110d229..993f9182 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -27,7 +27,6 @@ CPlayer::CPlayer(CGameContext *pGameServer, int ClientID, int Team) m_SpecExplicit = 0; m_Kills = 0; m_Deaths = 0; - m_PlayerWantToFollowCatcher = g_Config.m_SvFollowCatcher; m_LastKillTry = Server()->Tick(); m_TicksSpec = 0; m_TicksIngame = 0; diff --git a/src/game/server/player.h b/src/game/server/player.h index 3c15212f..a19209a8 100644 --- a/src/game/server/player.h +++ b/src/game/server/player.h @@ -104,7 +104,6 @@ public: int m_Deaths; int m_Kills; int m_LastKillTry; - bool m_PlayerWantToFollowCatcher; int m_TicksSpec; int m_TicksIngame; diff --git a/src/game/variables.h b/src/game/variables.h index 15a8e30f..182af208 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -97,7 +97,6 @@ MACRO_CONFIG_INT(SvAllowJoin, sv_allow_join, 2, 1, 2, CFGFLAG_SERVER, "Allow new //1 = Allowed to join; 2 = Will join when person with the most kills die MACRO_CONFIG_INT(SvColorIndicator, sv_color_indicator, 1, 0, 1, CFGFLAG_SERVER, "Color tees apropriate to the number of currently caught players") MACRO_CONFIG_INT(SvBonus, sv_bonus, 0, 0, 100, CFGFLAG_SERVER, "Give the last player extra points") -MACRO_CONFIG_INT(SvFollowCatcher, sv_follow_catcher, 1, 0, 1, CFGFLAG_SERVER, "If a victim should follow his catcher") MACRO_CONFIG_INT(SvLaserjumps, sv_laserjumps, 0, 0, 1, CFGFLAG_SERVER, "Use laserjumps - on a laser bounce a explosion will occur which takes no damage") MACRO_CONFIG_INT(SvChatValue, sv_chat_value, 250, 100, 1000, CFGFLAG_SERVER, "A value which is added on each message and decreased on each tick") -- cgit 1.4.1