From fe5bbf6d9b5da19b8bd9fa38e815ae65437fc6b6 Mon Sep 17 00:00:00 2001 From: def Date: Sat, 17 May 2014 16:39:42 +0200 Subject: [PATCH] Revert "New server feature: /spec & /pause straight to a player or freeview" This reverts commit b30a91ec41ebe431abcc93ac96a8626a54eaf353. --- src/game/server/ddracechat.cpp | 4 ---- src/game/server/ddracechat.h | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp index 960c194a1..754188dd6 100644 --- a/src/game/server/ddracechat.cpp +++ b/src/game/server/ddracechat.cpp @@ -334,8 +334,6 @@ void CGameContext::ConTogglePause(IConsole::IResult *pResult, void *pUserData) return; } - if (pResult->NumArguments() > 0) - pPlayer->m_SpectatorID = pResult->GetInteger(0); pPlayer->m_Paused = (pPlayer->m_Paused == CPlayer::PAUSED_PAUSED) ? CPlayer::PAUSED_NONE : CPlayer::PAUSED_PAUSED; } @@ -363,8 +361,6 @@ void CGameContext::ConToggleSpec(IConsole::IResult *pResult, void *pUserData) return; } - if (pResult->NumArguments() > 0) - pPlayer->m_SpectatorID = pResult->GetInteger(0); pPlayer->m_Paused = (pPlayer->m_Paused == CPlayer::PAUSED_SPEC) ? CPlayer::PAUSED_NONE : CPlayer::PAUSED_SPEC; } diff --git a/src/game/server/ddracechat.h b/src/game/server/ddracechat.h index 03e725d5f..58278a399 100644 --- a/src/game/server/ddracechat.h +++ b/src/game/server/ddracechat.h @@ -17,8 +17,8 @@ CHAT_COMMAND("w", "sr", CFGFLAG_CHAT|CFGFLAG_SERVER, ConWhisper, this, "Whisper CHAT_COMMAND("whisper", "sr", CFGFLAG_CHAT|CFGFLAG_SERVER, ConWhisper, this, "Whisper something to someone (private message)") CHAT_COMMAND("c", "r", CFGFLAG_CHAT|CFGFLAG_SERVER, ConConverse, this, "Converse with the last person you whispered to (private message)"); CHAT_COMMAND("converse", "r", CFGFLAG_CHAT|CFGFLAG_SERVER, ConConverse, this, "Converse with the last person you whispered to (private message)"); -CHAT_COMMAND("pause", "?i", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTogglePause, this, "Toggles pause (/pause -1 for immediate freeview)") -CHAT_COMMAND("spec", "?i", CFGFLAG_CHAT|CFGFLAG_SERVER, ConToggleSpec, this, "Toggles spec (/spec -1 for immediate freeview)") +CHAT_COMMAND("pause", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTogglePause, this, "Toggles pause (if not activated on the server, it toggles spec)") +CHAT_COMMAND("spec", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConToggleSpec, this, "Toggles spec") CHAT_COMMAND("dnd", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConDND, this, "Toggle Do Not Disturb (no chat and server messages)") CHAT_COMMAND("mapinfo", "?r", CFGFLAG_CHAT|CFGFLAG_SERVER, ConMapPoints, this, "Show info about the map with name r gives (current map by default)") CHAT_COMMAND("map", "?r", CFGFLAG_CHAT|CFGFLAG_SERVER, ConMap, this, "Vote a map by name")