Remove NetBitStreamInterfaceNoVersion

Author: botder

Server/mods/deathmatch/logic/common/CBitStream.h

@@ -20,18 +20,22 @@ class CBitStream
     {
         pBitStream = g_pNetServer->AllocateNetServerBitStream(0, pData, uiDataSize, bCopyData);
     }
+
     ~CBitStream() { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); };
-    NetBitStreamInterfaceNoVersion* operator->() { return pBitStream; }
 
-    NetBitStreamInterfaceNoVersion* pBitStream;
+    NetBitStreamInterface* operator->() { return pBitStream; }
+
+    NetBitStreamInterface* pBitStream;
 };
 
 // Use this if Version() is required - Make sure the player is the once receiving/sending the data
 class CPlayerBitStream
 {
 public:
-    CPlayerBitStream(class CPlayer* pPlayer);            //  { pBitStream = g_pNetServer->AllocateNetServerBitStream ( pPlayer->GetBitStreamVersion() ); };
+    CPlayerBitStream(class CPlayer* pPlayer);
+
     ~CPlayerBitStream() { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); };
+
     NetBitStreamInterface* operator->() { return pBitStream; }
 
     NetBitStreamInterface* pBitStream;

Shared/sdk/net/bitstream.h

@@ -28,13 +28,27 @@
 #endif
 
 struct ISyncStructure;
-class NetBitStreamInterface;
 
-class NetBitStreamInterfaceNoVersion : public CRefCountable
+// eBitStreamVersion allows us to track what BitStream version is being used without placing magic numbers everywhere.
+// It also helps us know what code branches can be removed when we increment a major version of MTA.
+// Make sure you only add new items to the end of the list, above the "Latest" entry.
+enum class eBitStreamVersion : unsigned short
 {
-public:
-    virtual operator NetBitStreamInterface&() = 0;
+    Unk = 0x030,
+
+    // DESCRIPTION
+    // YYYY-MM-DD
+    // Name,
+
+    // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
+    // Make sure you only add things above this comment.
+    Next,
+    Latest = Next - 1,
+};
 
+class NetBitStreamInterface : public CRefCountable
+{
+public:
     virtual int  GetReadOffsetAsBits() = 0;
     virtual void SetReadOffsetAsBits(int iOffset) = 0;
 
@@ -128,6 +142,10 @@ class NetBitStreamInterfaceNoVersion : public CRefCountable
 
     virtual unsigned char* GetData() const = 0;
 
+    virtual unsigned short Version() const = 0;
+
+    bool Can(eBitStreamVersion query) { return static_cast<eBitStreamVersion>(Version()) >= query; }
+
     // Force long types to use 4 bytes
     bool Read(unsigned long& e)
     {
@@ -394,39 +412,6 @@ class NetBitStreamInterfaceNoVersion : public CRefCountable
     }
 };
 
-// eBitStreamVersion allows us to track what BitStream version is being used without placing magic numbers everywhere.
-// It also helps us know what code branches can be removed when we increment a major version of MTA.
-// Make sure you only add new items to the end of the list, above the "Latest" entry.
-enum class eBitStreamVersion : unsigned short
-{
-    Unk = 0x030,
-
-    // DESCRIPTION
-    // YYYY-MM-DD
-    // Name,
-
-    // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
-    // Make sure you only add things above this comment.
-    Next,
-    Latest = Next - 1,
-};
-
-class NetBitStreamInterface : public NetBitStreamInterfaceNoVersion
-{
-    NetBitStreamInterface(const NetBitStreamInterface&);
-    const NetBitStreamInterface& operator=(const NetBitStreamInterface&);
-
-protected:
-    NetBitStreamInterface() { DEBUG_CREATE_COUNT("NetBitStreamInterface"); }
-    virtual ~NetBitStreamInterface() { DEBUG_DESTROY_COUNT("NetBitStreamInterface"); }
-
-public:
-    virtual                operator NetBitStreamInterface&() { return *this; }
-    virtual unsigned short Version() const = 0;
-
-    bool Can(eBitStreamVersion query) { return static_cast<eBitStreamVersion>(Version()) >= query; }
-};
-
 // Interface for all sync structures
 struct ISyncStructure
 {