Skip to content

Commit 49d3c56

Browse files
bobtistabobtista
committed
refactor(network): replicate to generals using patch method
1 parent 7643b33 commit 49d3c56

File tree

2 files changed

+40
-42
lines changed

2 files changed

+40
-42
lines changed

‎Generals/Code/GameEngine/Include/GameNetwork/NetPacketStructs.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Command & Conquer Generals(tm)
2+
** Command & Conquer Generals Zero Hour(tm)
33
** Copyright 2025 TheSuperHackers.
44
**
55
** This program is free software: you can redistribute it and/or modify
@@ -420,5 +420,3 @@ struct NetPacketFrameResendRequestCommand {
420420

421421
// Restore normal struct packing
422422
#pragma pack(pop)
423-
424-

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, Net
946946
}
947947

948948
void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
949-
NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
949+
NetPacketRouterAckCommandMsg *cmdMsg = static_cast<NetPacketRouterAckCommandMsg *>(msg->getCommand());
950950
UnsignedShort offset = 0;
951951
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command"));
952952

@@ -977,7 +977,7 @@ void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCo
977977
}
978978

979979
void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
980-
NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
980+
NetDisconnectChatCommandMsg *cmdMsg = static_cast<NetDisconnectChatCommandMsg *>(msg->getCommand());
981981
UnsignedShort offset = 0;
982982
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
983983

@@ -1015,7 +1015,7 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom
10151015
}
10161016

10171017
void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg) {
1018-
NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
1018+
NetDisconnectVoteCommandMsg *cmdMsg = static_cast<NetDisconnectVoteCommandMsg *>(msg->getCommand());
10191019
UnsignedShort offset = 0;
10201020
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command"));
10211021

@@ -1120,7 +1120,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m
11201120
}
11211121

11221122
void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
1123-
NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
1123+
NetProgressCommandMsg *cmdMsg = static_cast<NetProgressCommandMsg *>(msg->getCommand());
11241124
UnsignedShort offset = 0;
11251125

11261126
// If necessary, put the NetCommandType into the packet.
@@ -1314,7 +1314,7 @@ void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetComma
13141314
}
13151315

13161316
void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
1317-
NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
1317+
NetFileProgressCommandMsg *cmdMsg = static_cast<NetFileProgressCommandMsg *>(msg->getCommand());
13181318
UnsignedInt offset = 0;
13191319

13201320
// command type
@@ -1356,7 +1356,7 @@ void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetComma
13561356
}
13571357

13581358
void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg) {
1359-
NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
1359+
NetDisconnectFrameCommandMsg *cmdMsg = static_cast<NetDisconnectFrameCommandMsg *>(msg->getCommand());
13601360
UnsignedInt offset = 0;
13611361

13621362
// command type
@@ -1394,7 +1394,7 @@ void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCo
13941394
}
13951395

13961396
void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg) {
1397-
NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
1397+
NetDisconnectScreenOffCommandMsg *cmdMsg = static_cast<NetDisconnectScreenOffCommandMsg *>(msg->getCommand());
13981398
UnsignedInt offset = 0;
13991399

14001400
// command type
@@ -1432,7 +1432,7 @@ void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, N
14321432
}
14331433

14341434
void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg) {
1435-
NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
1435+
NetFrameResendRequestCommandMsg *cmdMsg = static_cast<NetFrameResendRequestCommandMsg *>(msg->getCommand());
14361436
UnsignedInt offset = 0;
14371437

14381438
// command type
@@ -1620,7 +1620,7 @@ Z = Repeat last command
16201620
Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) {
16211621
Bool needNewCommandID = FALSE;
16221622
if (isRoomForFrameResendRequestMessage(msg)) {
1623-
NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
1623+
NetFrameResendRequestCommandMsg *cmdMsg = static_cast<NetFrameResendRequestCommandMsg *>(msg->getCommand());
16241624

16251625
// If necessary, put the NetCommandType into the packet.
16261626
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -1698,7 +1698,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) {
16981698
Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) {
16991699
Int len = 0;
17001700
Bool needNewCommandID = FALSE;
1701-
NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
1701+
NetFrameResendRequestCommandMsg *cmdMsg = static_cast<NetFrameResendRequestCommandMsg *>(msg->getCommand());
17021702
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
17031703
++len;
17041704
len += sizeof(UnsignedByte);
@@ -1729,7 +1729,7 @@ Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) {
17291729
Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) {
17301730
Bool needNewCommandID = FALSE;
17311731
if (isRoomForDisconnectScreenOffMessage(msg)) {
1732-
NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
1732+
NetDisconnectScreenOffCommandMsg *cmdMsg = static_cast<NetDisconnectScreenOffCommandMsg *>(msg->getCommand());
17331733

17341734
// If necessary, put the NetCommandType into the packet.
17351735
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -1807,7 +1807,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) {
18071807
Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) {
18081808
Int len = 0;
18091809
Bool needNewCommandID = FALSE;
1810-
NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
1810+
NetDisconnectScreenOffCommandMsg *cmdMsg = static_cast<NetDisconnectScreenOffCommandMsg *>(msg->getCommand());
18111811
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
18121812
++len;
18131813
len += sizeof(UnsignedByte);
@@ -1838,7 +1838,7 @@ Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) {
18381838
Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) {
18391839
Bool needNewCommandID = FALSE;
18401840
if (isRoomForDisconnectFrameMessage(msg)) {
1841-
NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
1841+
NetDisconnectFrameCommandMsg *cmdMsg = static_cast<NetDisconnectFrameCommandMsg *>(msg->getCommand());
18421842

18431843
// If necessary, put the NetCommandType into the packet.
18441844
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -1916,7 +1916,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) {
19161916
Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) {
19171917
Int len = 0;
19181918
Bool needNewCommandID = FALSE;
1919-
NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
1919+
NetDisconnectFrameCommandMsg *cmdMsg = static_cast<NetDisconnectFrameCommandMsg *>(msg->getCommand());
19201920
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
19211921
++len;
19221922
len += sizeof(UnsignedByte);
@@ -2156,7 +2156,7 @@ Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) {
21562156
Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) {
21572157
Bool needNewCommandID = FALSE;
21582158
if (isRoomForFileProgressMessage(msg)) {
2159-
NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
2159+
NetFileProgressCommandMsg *cmdMsg = static_cast<NetFileProgressCommandMsg *>(msg->getCommand());
21602160

21612161
// If necessary, put the NetCommandType into the packet.
21622162
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -2226,7 +2226,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) {
22262226
Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) {
22272227
Int len = 0;
22282228
Bool needNewCommandID = FALSE;
2229-
NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
2229+
NetFileProgressCommandMsg *cmdMsg = static_cast<NetFileProgressCommandMsg *>(msg->getCommand());
22302230
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
22312231
len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
22322232
}
@@ -2255,7 +2255,7 @@ Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) {
22552255
Bool NetPacket::addWrapperCommand(NetCommandRef *msg) {
22562256
Bool needNewCommandID = FALSE;
22572257
if (isRoomForWrapperMessage(msg)) {
2258-
NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
2258+
NetWrapperCommandMsg *cmdMsg = static_cast<NetWrapperCommandMsg *>(msg->getCommand());
22592259

22602260
// If necessary, put the NetCommandType into the packet.
22612261
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -2356,7 +2356,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) {
23562356
Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) {
23572357
Int len = 0;
23582358
Bool needNewCommandID = FALSE;
2359-
NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
2359+
NetWrapperCommandMsg *cmdMsg = static_cast<NetWrapperCommandMsg *>(msg->getCommand());
23602360
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
23612361
len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
23622362
}
@@ -2577,7 +2577,7 @@ Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) {
25772577
*/
25782578
Bool NetPacket::addProgressMessage(NetCommandRef *msg) {
25792579
if (isRoomForProgressMessage(msg)) {
2580-
NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
2580+
NetProgressCommandMsg *cmdMsg = static_cast<NetProgressCommandMsg *>(msg->getCommand());
25812581

25822582
// If necessary, put the NetCommandType into the packet.
25832583
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
@@ -2633,7 +2633,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) {
26332633
*/
26342634
Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) {
26352635
Int len = 0;
2636-
NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
2636+
NetProgressCommandMsg *cmdMsg = static_cast<NetProgressCommandMsg *>(msg->getCommand());
26372637
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
26382638
++len;
26392639
len += sizeof(UnsignedByte);
@@ -2662,7 +2662,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) {
26622662
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - entering..."));
26632663
// need type, player id, relay, command id, slot number
26642664
if (isRoomForDisconnectVoteMessage(msg)) {
2665-
NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
2665+
NetDisconnectVoteCommandMsg *cmdMsg = static_cast<NetDisconnectVoteCommandMsg *>(msg->getCommand());
26662666
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command"));
26672667

26682668
// If necessary, put the NetCommandType into the packet.
@@ -2740,7 +2740,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) {
27402740
Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) {
27412741
Int len = 0;
27422742
Bool needNewCommandID = FALSE;
2743-
NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
2743+
NetDisconnectVoteCommandMsg *cmdMsg = static_cast<NetDisconnectVoteCommandMsg *>(msg->getCommand());
27442744
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
27452745
++len;
27462746
len += sizeof(UnsignedByte);
@@ -2772,7 +2772,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
27722772
// data format: 1 byte string length, string (two bytes per character)
27732773
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - Entering..."));
27742774
if (isRoomForDisconnectChatMessage(msg)) {
2775-
NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
2775+
NetDisconnectChatCommandMsg *cmdMsg = static_cast<NetDisconnectChatCommandMsg *>(msg->getCommand());
27762776
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
27772777

27782778
// If necessary, put the NetCommandType into the packet.
@@ -2833,7 +2833,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
28332833

28342834
Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) {
28352835
Int len = 0;
2836-
NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
2836+
NetDisconnectChatCommandMsg *cmdMsg = static_cast<NetDisconnectChatCommandMsg *>(msg->getCommand());
28372837
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
28382838
++len;
28392839
len += sizeof(UnsignedByte);
@@ -2983,7 +2983,7 @@ Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) {
29832983
Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) {
29842984
// need type, player id, relay, command id, slot number
29852985
if (isRoomForPacketRouterAckMessage(msg)) {
2986-
NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
2986+
NetPacketRouterAckCommandMsg *cmdMsg = static_cast<NetPacketRouterAckCommandMsg *>(msg->getCommand());
29872987
// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command"));
29882988

29892989
// If necessary, put the NetCommandType into the packet.
@@ -3040,7 +3040,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) {
30403040
*/
30413041
Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) {
30423042
Int len = 0;
3043-
NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
3043+
NetPacketRouterAckCommandMsg *cmdMsg = static_cast<NetPacketRouterAckCommandMsg *>(msg->getCommand());
30443044
if (m_lastCommandType != cmdMsg->getNetCommandType()) {
30453045
++len;
30463046
len += sizeof(UnsignedByte);
@@ -4019,8 +4019,8 @@ Bool NetPacket::isFrameRepeat(NetCommandRef *msg) {
40194019
if (m_lastCommand->getCommand()->getNetCommandType() != NETCOMMANDTYPE_FRAMEINFO) {
40204020
return FALSE;
40214021
}
4022-
NetFrameCommandMsg *framemsg = (NetFrameCommandMsg *)(msg->getCommand());
4023-
NetFrameCommandMsg *lastmsg = (NetFrameCommandMsg *)(m_lastCommand->getCommand());
4022+
NetFrameCommandMsg *framemsg = static_cast<NetFrameCommandMsg *>(msg->getCommand());
4023+
NetFrameCommandMsg *lastmsg = static_cast<NetFrameCommandMsg *>(m_lastCommand->getCommand());
40244024
if (framemsg->getCommandCount() != 0) {
40254025
return FALSE;
40264026
}
@@ -4040,23 +4040,23 @@ Bool NetPacket::isFrameRepeat(NetCommandRef *msg) {
40404040
* Add an ack "both" command.
40414041
*/
40424042
Bool NetPacket::addAckBothCommand(NetCommandRef *msg) {
4043-
NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)(msg->getCommand());
4043+
NetAckBothCommandMsg *ackmsg = static_cast<NetAckBothCommandMsg *>(msg->getCommand());
40444044
return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
40454045
}
40464046

40474047
/**
40484048
* Add an ack stage 1 command.
40494049
*/
40504050
Bool NetPacket::addAckStage1Command(NetCommandRef *msg) {
4051-
NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)(msg->getCommand());
4051+
NetAckStage1CommandMsg *ackmsg = static_cast<NetAckStage1CommandMsg *>(msg->getCommand());
40524052
return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
40534053
}
40544054

40554055
/**
40564056
* Add an ack stage 2 command.
40574057
*/
40584058
Bool NetPacket::addAckStage2Command(NetCommandRef *msg) {
4059-
NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)(msg->getCommand());
4059+
NetAckStage2CommandMsg *ackmsg = static_cast<NetAckStage2CommandMsg *>(msg->getCommand());
40604060
return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
40614061
}
40624062

@@ -4162,8 +4162,8 @@ Bool NetPacket::isAckRepeat(NetCommandRef *msg) {
41624162
}
41634163

41644164
Bool NetPacket::isAckBothRepeat(NetCommandRef *msg) {
4165-
NetAckBothCommandMsg *ack = (NetAckBothCommandMsg *)(msg->getCommand());
4166-
NetAckBothCommandMsg *lastAck = (NetAckBothCommandMsg *)(m_lastCommand->getCommand());
4165+
NetAckBothCommandMsg *ack = static_cast<NetAckBothCommandMsg *>(msg->getCommand());
4166+
NetAckBothCommandMsg *lastAck = static_cast<NetAckBothCommandMsg *>(m_lastCommand->getCommand());
41674167
if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
41684168
return FALSE;
41694169
}
@@ -4177,8 +4177,8 @@ Bool NetPacket::isAckBothRepeat(NetCommandRef *msg) {
41774177
}
41784178

41794179
Bool NetPacket::isAckStage1Repeat(NetCommandRef *msg) {
4180-
NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
4181-
NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
4180+
NetAckStage2CommandMsg *ack = static_cast<NetAckStage2CommandMsg *>(msg->getCommand());
4181+
NetAckStage2CommandMsg *lastAck = static_cast<NetAckStage2CommandMsg *>(m_lastCommand->getCommand());
41824182
if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
41834183
return FALSE;
41844184
}
@@ -4192,8 +4192,8 @@ Bool NetPacket::isAckStage1Repeat(NetCommandRef *msg) {
41924192
}
41934193

41944194
Bool NetPacket::isAckStage2Repeat(NetCommandRef *msg) {
4195-
NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
4196-
NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
4195+
NetAckStage2CommandMsg *ack = static_cast<NetAckStage2CommandMsg *>(msg->getCommand());
4196+
NetAckStage2CommandMsg *lastAck = static_cast<NetAckStage2CommandMsg *>(m_lastCommand->getCommand());
41974197
if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
41984198
return FALSE;
41994199
}
@@ -4211,7 +4211,7 @@ Bool NetPacket::isAckStage2Repeat(NetCommandRef *msg) {
42114211
*/
42124212
Bool NetPacket::addGameCommand(NetCommandRef *msg) {
42134213
Bool retval = FALSE;
4214-
NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
4214+
NetGameCommandMsg *cmdMsg = static_cast<NetGameCommandMsg *>(msg->getCommand());
42154215
// get the game message from the NetCommandMsg
42164216
GameMessage *gmsg = cmdMsg->constructGameMessage();
42174217

@@ -4389,7 +4389,7 @@ Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
43894389
// Calculate how much space the NetCommandMsg will take in this packet.
43904390
Int msglen = 0;
43914391

4392-
NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
4392+
NetGameCommandMsg *cmdMsg = static_cast<NetGameCommandMsg *>(msg->getCommand());
43934393

43944394
Bool needNewCommandID = FALSE;
43954395

0 commit comments

Comments
 (0)