Skip to content

Commit 0630ab5

Browse files
committed
refactor(network): split argument type/count size calculation into separate lines
1 parent 5da72f8 commit 0630ab5

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,8 @@ UnsignedInt NetPacket::GetGameCommandSize(NetCommandMsg *msg) {
369369
// Int numTypes = parser->getNumTypes();
370370
GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
371371
while (arg != NULL) {
372-
msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
372+
msglen += sizeof(UnsignedByte); // argument type
373+
msglen += sizeof(UnsignedByte); // argument count
373374
GameMessageArgumentDataType type = arg->getType();
374375

375376
switch (type) {
@@ -4937,7 +4938,8 @@ Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
49374938
// Int numTypes = parser->getNumTypes();
49384939
GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
49394940
while (arg != NULL) {
4940-
msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
4941+
msglen += sizeof(UnsignedByte); // argument type
4942+
msglen += sizeof(UnsignedByte); // argument count
49414943
GameMessageArgumentDataType type = arg->getType();
49424944

49434945
switch (type) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ size_t NetGameCommandMsg::getByteCount() const {
248248

249249
GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
250250
while (arg != NULL) {
251-
msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
251+
msglen += sizeof(UnsignedByte); // argument type
252+
msglen += sizeof(UnsignedByte); // argument count
252253
GameMessageArgumentDataType type = arg->getType();
253254

254255
switch (type) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4582,7 +4582,8 @@ Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
45824582
// Int numTypes = parser->getNumTypes();
45834583
GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
45844584
while (arg != NULL) {
4585-
msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
4585+
msglen += sizeof(UnsignedByte); // argument type
4586+
msglen += sizeof(UnsignedByte); // argument count
45864587
GameMessageArgumentDataType type = arg->getType();
45874588

45884589
switch (type) {

0 commit comments

Comments
 (0)