Make getPackedByteCount() a pure virtual function and eliminate switch statement

Author: bobtista

GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h

@@ -53,6 +53,7 @@ class NetCommandMsg : public MemoryPoolObject
 	inline void setNetCommandType(NetCommandType type) { m_commandType = type; }
 	inline NetCommandType getNetCommandType() { return m_commandType; }
 	virtual Int getSortNumber();
+	virtual size_t getPackedByteCount() const = 0;
 	void attach();
 	void detach();
 
@@ -83,7 +84,7 @@ class NetGameCommandMsg : public NetCommandMsg
 	void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
 	void setGameMessageType(GameMessage::Type type);
 
-	size_t getPackedByteCount() const;
+	size_t getPackedByteCount() const override;
 
 protected:
 	Int m_numArgs;
@@ -111,7 +112,7 @@ class NetAckBothCommandMsg : public NetCommandMsg
 	void setOriginalPlayerID(UnsignedByte originalPlayerID);
 	virtual Int getSortNumber();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_commandID;
@@ -137,7 +138,7 @@ class NetAckStage1CommandMsg : public NetCommandMsg
 	void setOriginalPlayerID(UnsignedByte originalPlayerID);
 	virtual Int getSortNumber();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_commandID;
@@ -163,7 +164,7 @@ class NetAckStage2CommandMsg : public NetCommandMsg
 	void setOriginalPlayerID(UnsignedByte originalPlayerID);
 	virtual Int getSortNumber();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_commandID;
@@ -181,7 +182,7 @@ class NetFrameCommandMsg : public NetCommandMsg
 	void setCommandCount(UnsignedShort commandCount);
 	UnsignedShort getCommandCount();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_commandCount;
@@ -198,7 +199,7 @@ class NetPlayerLeaveCommandMsg : public NetCommandMsg
 	UnsignedByte getLeavingPlayerID();
 	void setLeavingPlayerID(UnsignedByte id);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedByte m_leavingPlayerID;
@@ -217,7 +218,7 @@ class NetRunAheadMetricsCommandMsg : public NetCommandMsg
 	Int  getAverageFps();
 	void setAverageFps(Int fps);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	Real m_averageLatency;
@@ -238,7 +239,7 @@ class NetRunAheadCommandMsg : public NetCommandMsg
 	UnsignedByte getFrameRate();
 	void setFrameRate(UnsignedByte frameRate);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_runAhead;
@@ -256,7 +257,7 @@ class NetDestroyPlayerCommandMsg : public NetCommandMsg
 	UnsignedInt getPlayerIndex();
 	void setPlayerIndex(UnsignedInt playerIndex);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedInt m_playerIndex;
@@ -270,7 +271,7 @@ class NetKeepAliveCommandMsg : public NetCommandMsg
 	NetKeepAliveCommandMsg();
 	//virtual ~NetKeepAliveCommandMsg();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 };
 
 //-----------------------------------------------------------------------------
@@ -281,7 +282,7 @@ class NetDisconnectKeepAliveCommandMsg : public NetCommandMsg
 	NetDisconnectKeepAliveCommandMsg();
 	//virtual ~NetDisconnectKeepAliveCommandMsg();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 };
 
 //-----------------------------------------------------------------------------
@@ -298,7 +299,7 @@ class NetDisconnectPlayerCommandMsg : public NetCommandMsg
 	UnsignedInt getDisconnectFrame();
 	void setDisconnectFrame(UnsignedInt frame);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedByte m_disconnectSlot;
@@ -313,7 +314,7 @@ class NetPacketRouterQueryCommandMsg : public NetCommandMsg
 	NetPacketRouterQueryCommandMsg();
 	//virtual ~NetPacketRouterQueryCommandMsg();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 };
 
 //-----------------------------------------------------------------------------
@@ -324,7 +325,7 @@ class NetPacketRouterAckCommandMsg : public NetCommandMsg
 	NetPacketRouterAckCommandMsg();
 	//virtual ~NetPacketRouterAckCommandMsg();
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 };
 
 //-----------------------------------------------------------------------------
@@ -338,7 +339,7 @@ class NetDisconnectChatCommandMsg : public NetCommandMsg
 	UnicodeString getText();
 	void setText(UnicodeString text);
 
-	size_t getPackedByteCount() const;
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnicodeString m_text;
@@ -358,7 +359,7 @@ class NetChatCommandMsg : public NetCommandMsg
 	Int getPlayerMask( void );
 	void setPlayerMask( Int playerMask );
 
-	size_t getPackedByteCount() const;
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnicodeString m_text;
@@ -379,7 +380,7 @@ class NetDisconnectVoteCommandMsg : public NetCommandMsg
 	UnsignedInt getVoteFrame();
 	void setVoteFrame(UnsignedInt voteFrame);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedByte m_slot;
@@ -397,7 +398,7 @@ class NetProgressCommandMsg: public NetCommandMsg
 	UnsignedByte getPercentage();
 	void setPercentage( UnsignedByte percent );
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 protected:
 	UnsignedByte m_percent;
 };
@@ -413,7 +414,7 @@ class NetWrapperCommandMsg : public NetCommandMsg
 	UnsignedByte * getData();
 	void setData(UnsignedByte *data, UnsignedInt dataLength);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 	UnsignedInt getChunkNumber();
 	void setChunkNumber(UnsignedInt chunkNumber);
@@ -462,7 +463,7 @@ class NetFileCommandMsg : public NetCommandMsg
 	UnsignedByte * getFileData();
 	void setFileData(UnsignedByte *data, UnsignedInt dataLength);
 
-	size_t getPackedByteCount() const;
+	size_t getPackedByteCount() const override;
 
 protected:
 	AsciiString m_portableFilename;
@@ -491,7 +492,7 @@ class NetFileAnnounceCommandMsg : public NetCommandMsg
 	UnsignedByte getPlayerMask(void);
 	void setPlayerMask(UnsignedByte playerMask);
 
-	size_t getPackedByteCount() const;
+	size_t getPackedByteCount() const override;
 
 protected:
 	AsciiString m_portableFilename;
@@ -513,7 +514,7 @@ class NetFileProgressCommandMsg : public NetCommandMsg
 	Int getProgress();
 	void setProgress(Int val);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedShort m_fileID;
@@ -530,7 +531,7 @@ class NetDisconnectFrameCommandMsg : public NetCommandMsg
 	UnsignedInt getDisconnectFrame();
 	void setDisconnectFrame(UnsignedInt disconnectFrame);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedInt m_disconnectFrame;
@@ -546,7 +547,7 @@ class NetDisconnectScreenOffCommandMsg : public NetCommandMsg
 	UnsignedInt getNewFrame();
 	void setNewFrame(UnsignedInt newFrame);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedInt m_newFrame;
@@ -562,7 +563,7 @@ class NetFrameResendRequestCommandMsg : public NetCommandMsg
 	UnsignedInt getFrameToResend();
 	void setFrameToResend(UnsignedInt frame);
 
-	static size_t getPackedByteCount();
+	size_t getPackedByteCount() const override;
 
 protected:
 	UnsignedInt m_frameToResend;