Revert "Fix #741: Add new CServerRPCControlPacket to toggle RPCs from server (#1978)"

This reverts commit 146bd15.

Author: patrikjuvonen

Client/mods/deathmatch/StdInc.h

@@ -47,7 +47,6 @@
 #include <ijsify.h>
 #include <Common.h>
 #include "net/Packets.h"
-#include "net/rpc_enums.h"
 #include "Enums.h"
 #include "net/SyncStructures.h"
 #include "CIdArray.h"

Client/mods/deathmatch/logic/CClientGame.h

@@ -440,12 +440,6 @@ class CClientGame
 
     void TriggerDiscordJoin(SString strSecret);
 
-    inline const bool IsServerRPCFunctionDisabled(const eServerRPCFunctions eServerRPCFunction) const { return m_disabledServerRPCFunctions[eServerRPCFunction]; };
-    inline void SetServerRPCFunctionDisabled(const eServerRPCFunctions eServerRPCFunction, const bool bDisabled = true)
-    {
-        m_disabledServerRPCFunctions[eServerRPCFunction] = bDisabled;
-    };
-
 private:
     // CGUI Callbacks
     bool OnKeyDown(CGUIKeyEventArgs Args);
@@ -830,8 +824,6 @@ class CClientGame
     SString                 m_strACInfo;
     std::map<uint, uint>    m_SentMessageIds;
 
-    std::array<bool, eServerRPCFunctions::NUM_SERVER_RPC_FUNCS> m_disabledServerRPCFunctions;
-
     bool              m_bLastKeyWasEscapeCancelled;
     std::set<SString> m_AllowKeyUpMap;
     uint              m_uiPrecisionCallDepth;

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -1993,9 +1993,6 @@ void CNetAPI::WriteCameraSync(NetBitStreamInterface& BitStream)
 
 void CNetAPI::RPC(eServerRPCFunctions ID, NetBitStreamInterface* pBitStream)
 {
-    if (g_pClientGame->IsServerRPCFunctionDisabled(ID))
-        return;
-
     NetBitStreamInterface* pRPCBitStream = g_pNet->AllocateNetBitStream();
     if (pRPCBitStream)
     {

Client/mods/deathmatch/logic/CNetAPI.h

@@ -25,6 +25,17 @@ class CNetAPI;
 #define CAM_SYNC_RATE   ( g_TickRateSettings.iCamSync )
 #define TICK_RATE_AIM   ( std::min ( TICK_RATE, g_TickRateSettings.iKeySyncRotation ) )  // Keysync or puresync update the aim, so use the shortest interval
 
+enum eServerRPCFunctions
+{
+    PLAYER_INGAME_NOTICE,
+    INITIAL_DATA_STREAM,
+    PLAYER_TARGET,
+    PLAYER_WEAPON,
+    KEY_BIND,
+    CURSOR_EVENT,
+    REQUEST_STEALTH_KILL,
+};
+
 class CNetAPI
 {
 public:

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -210,10 +210,6 @@ bool CPacketHandler::ProcessPacket(unsigned char ucPacketID, NetBitStreamInterfa
             Packet_ServerInfoSync(bitStream);
             return true;
 
-        case PACKET_ID_SERVER_RPC_CONTROL:
-            Packet_ServerRPCControl(bitStream);
-            return true;
-
         default:
             break;
     }
@@ -5324,21 +5320,6 @@ void CPacketHandler::Packet_ServerInfoSync(NetBitStreamInterface& bitStream)
     }
 }
 
-void CPacketHandler::Packet_ServerRPCControl(NetBitStreamInterface& bitStream)
-{
-    unsigned short usNumFunctions;
-    if (bitStream.ReadCompressed(usNumFunctions))
-    {
-        for (unsigned short us = 0; us < usNumFunctions; us++)
-        {
-            unsigned int uiServerRPCFunction;
-            bool         bDisabled;
-            if (bitStream.Read(uiServerRPCFunction) && bitStream.ReadBit(bDisabled))
-                g_pClientGame->SetServerRPCFunctionDisabled(static_cast<eServerRPCFunctions>(uiServerRPCFunction), bDisabled);
-        }
-    }
-}
-
 //
 //
 //

Client/mods/deathmatch/logic/CPacketHandler.h

@@ -100,7 +100,6 @@ class CPacketHandler
     void Packet_ChatClear(NetBitStreamInterface& bitStream);
     void Packet_ServerInfoSync(NetBitStreamInterface& bitStream);
     void Packet_PolygonHeight(NetBitStreamInterface& bitStream);
-    void Packet_ServerRPCControl(NetBitStreamInterface& bitStream);
 
     // For debugging protocol errors during ENTITY_ADD packet
     void    EntityAddDebugBegin(uint uiNumEntities, NetBitStreamInterface* pBitStream);

Client/mods/deathmatch/logic/rpc/CRPCFunctions.cpp

@@ -49,8 +49,8 @@ CBlendedWeather*           CRPCFunctions::m_pBlendedWeather;
 CClientGame*               CRPCFunctions::m_pClientGame;
 CClientWaterManager*       CRPCFunctions::m_pWaterManager;
 
-SFixedArray<CRPCFunctions::SRPCHandler, eElementRPCFunctions::NUM_RPC_FUNCS>        CRPCFunctions::m_RPCHandlers;
-SFixedArray<CRPCFunctions::SElementRPCHandler, eElementRPCFunctions::NUM_RPC_FUNCS> CRPCFunctions::m_ElementRPCHandlers;
+SFixedArray<CRPCFunctions::SRPCHandler, CRPCFunctions::NUM_RPC_FUNCS>        CRPCFunctions::m_RPCHandlers;
+SFixedArray<CRPCFunctions::SElementRPCHandler, CRPCFunctions::NUM_RPC_FUNCS> CRPCFunctions::m_ElementRPCHandlers;
 
 CRPCFunctions::CRPCFunctions(CClientGame* pClientGame)
 {

Server/mods/deathmatch/StdInc.h

@@ -40,7 +40,6 @@ struct SAclRequest;
 #include "CBox.h"
 #include "CMatrix.h"
 #include "net/Packets.h"
-#include "net/rpc_enums.h"
 #include "Enums.h"
 #include <bochs_internal/bochs_crc32.h>
 #include "CChecksum.h"
@@ -96,7 +95,6 @@ struct SAclRequest;
 #include "packets/CResourceStopPacket.h"
 #include "packets/CResourceClientScriptsPacket.h"
 #include "packets/CReturnSyncPacket.h"
-#include "packets/CServerRPCControlPacket.h"
 #include "packets/CServerTextItemPacket.h"
 #include "packets/CUpdateInfoPacket.h"
 #include "packets/CUnoccupiedVehicleStartSyncPacket.h"

Server/mods/deathmatch/logic/CEvents.cpp

@@ -17,7 +17,7 @@ CEvents::CEvents()
     m_bEventCancelled = false;
 }
 
-bool CEvents::AddEvent(const char* szName, const char* szArguments, CLuaMain* pLuaMain, bool bAllowRemoteTrigger, eServerRPCFunctions eServerRPCFunction)
+bool CEvents::AddEvent(const char* szName, const char* szArguments, CLuaMain* pLuaMain, bool bAllowRemoteTrigger)
 {
     assert(szName);
     assert(szArguments);
@@ -32,7 +32,6 @@ bool CEvents::AddEvent(const char* szName, const char* szArguments, CLuaMain* pL
     pEvent->strArguments = szArguments;
     pEvent->pLuaMain = pLuaMain;
     pEvent->bAllowRemoteTrigger = bAllowRemoteTrigger;
-    pEvent->eServerRPCFunction = eServerRPCFunction;
 
     m_EventHashMap[szName] = pEvent;
 

Server/mods/deathmatch/logic/CEvents.h

@@ -17,11 +17,10 @@
 
 struct SEvent
 {
-    class CLuaMain*     pLuaMain;
-    std::string         strName;
-    std::string         strArguments;
-    bool                bAllowRemoteTrigger;
-    eServerRPCFunctions eServerRPCFunction;
+    class CLuaMain* pLuaMain;
+    std::string     strName;
+    std::string     strArguments;
+    bool            bAllowRemoteTrigger;
 };
 
 class CEvents
@@ -30,8 +29,7 @@ class CEvents
     CEvents();
     ~CEvents() { RemoveAllEvents(); };
 
-    bool AddEvent(const char* szName, const char* szArguments, class CLuaMain* pLuaMain, bool bAllowRemoteTrigger,
-                  eServerRPCFunctions eServerRPCFunction = eServerRPCFunctions::NUM_SERVER_RPC_FUNCS);
+    bool AddEvent(const char* szName, const char* szArguments, class CLuaMain* pLuaMain, bool bAllowRemoteTrigger);
     void RemoveEvent(SEvent* pEvent);
     void RemoveEvent(const char* szName);
     void RemoveAllEvents(class CLuaMain* pMain);