Skip to content

Commit ba6335d

Browse files
committed
refactor: add getByteCount() method to NetChatCommandMsg and use it
1 parent c7d626b commit ba6335d

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ class NetChatCommandMsg : public NetCommandMsg
328328
Int getPlayerMask( void );
329329
void setPlayerMask( Int playerMask );
330330

331+
size_t getByteCount() const;
332+
331333
protected:
332334
UnicodeString m_text;
333335
Int m_playerMask;

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,14 @@ void NetChatCommandMsg::setPlayerMask( Int playerMask )
759759
m_playerMask = playerMask;
760760
}
761761

762+
/**
763+
* Get the byte count for this chat message.
764+
*/
765+
size_t NetChatCommandMsg::getByteCount() const
766+
{
767+
return m_text.getLength() * sizeof(UnsignedShort) + sizeof(m_playerMask);
768+
}
769+
762770
//-------------------------
763771
// NetDisconnectVoteCommandMsg
764772
//-------------------------

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,7 @@ UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) {
476476

477477
UnsignedInt NetPacket::GetChatCommandSize(NetCommandMsg *msg) {
478478
NetChatCommandMsg *cmdMsg = static_cast<NetChatCommandMsg*>(msg);
479-
UnsignedByte textmsglen = cmdMsg->getText().getLength();
480-
return sizeof(NetPacketChatCommandHeader) + (textmsglen * sizeof(UnsignedShort)) + sizeof(Int);
479+
return sizeof(NetPacketChatCommandHeader) + cmdMsg->getByteCount();
481480
}
482481

483482
UnsignedInt NetPacket::GetProgressMessageSize(NetCommandMsg *msg) {

0 commit comments

Comments
 (0)