Skip to content

Commit e28d7b6

Browse files
MaullerMauller
committed
refactor(debug): rename GetAsciiNetCommandType to GetNetCommandTypeAsString and internally change it to use a switch and to return c strings
1 parent fef5251 commit e28d7b6

File tree

14 files changed

+156
-156
lines changed

14 files changed

+156
-156
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Bool DoesCommandRequireACommandID(NetCommandType type);
3737
Bool CommandRequiresAck(NetCommandMsg *msg);
3838
Bool CommandRequiresDirectSend(NetCommandMsg *msg);
3939
Bool IsCommandSynchronized(NetCommandType type);
40-
AsciiString GetAsciiNetCommandType(NetCommandType type);
40+
const char* GetNetCommandTypeAsString(NetCommandType type);
4141

4242
#ifdef DEBUG_LOGGING
4343
extern "C" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ void Connection::debugPrintCommands() {
416416
NetCommandRef *ref = m_netCommandList->getFirstMessage();
417417
while (ref != NULL) {
418418
DEBUG_LOG(("Connection::debugPrintCommands - ID: %d\tType: %s\tRelay: 0x%X for frame %d",
419-
ref->getCommand()->getID(), GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(),
419+
ref->getCommand()->getID(), GetNetCommandTypeAsString(ref->getCommand()->getNetCommandType()),
420420
ref->getRelay(), ref->getCommand()->getExecutionFrame()));
421421
ref = ref->getNext();
422422
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void ConnectionManager::doRelay() {
364364
// Iterate through the commands in this packet and send them to the proper connections.
365365
while (cmd != NULL) {
366366
//DEBUG_LOG(("ConnectionManager::doRelay() - Looking at a command of type %s",
367-
//GetAsciiNetCommandType(cmd->getCommand()->getNetCommandType()).str()));
367+
//GetNetCommandTypeAsString(cmd->getCommand()->getNetCommandType())));
368368
if (CommandRequiresAck(cmd->getCommand())) {
369369
ackCommand(cmd, m_localSlot);
370370
}
@@ -1115,12 +1115,12 @@ void ConnectionManager::sendRemoteCommand(NetCommandRef *msg) {
11151115
}
11161116

11171117
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - sending net command %d of type %s from player %d, relay is 0x%x",
1118-
msg->getCommand()->getID(), GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getRelay()));
1118+
msg->getCommand()->getID(), GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getRelay()));
11191119

11201120
UnsignedByte relay = msg->getRelay();
11211121
if ((relay & (1 << m_localSlot)) && (m_frameData[msg->getCommand()->getPlayerID()] != NULL)) {
11221122
if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
1123-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
1123+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
11241124
m_frameData[msg->getCommand()->getPlayerID()]->addNetCommandMsg(msg->getCommand());
11251125
}
11261126
}
@@ -1486,10 +1486,10 @@ void ConnectionManager::sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay
14861486
msg->attach();
14871487

14881488
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - sending net command %d of type %s", msg->getID(),
1489-
GetAsciiNetCommandType(msg->getNetCommandType()).str()));
1489+
GetNetCommandTypeAsString(msg->getNetCommandType())));
14901490

14911491
if (relay & (1 << m_localSlot)) {
1492-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
1492+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
14931493
m_frameData[m_localSlot]->addNetCommandMsg(msg);
14941494
}
14951495

@@ -1533,7 +1533,7 @@ void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte
15331533

15341534
if (((relay & (1 << m_localSlot)) != 0) && (m_frameData[m_localSlot] != NULL)) {
15351535
if (IsCommandSynchronized(msg->getNetCommandType()) == TRUE) {
1536-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
1536+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
15371537
m_frameData[m_localSlot]->addNetCommandMsg(msg);
15381538
}
15391539
}
@@ -1543,7 +1543,7 @@ void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte
15431543
if ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) {
15441544
UnsignedByte temprelay = 1 << i;
15451545
m_connections[i]->sendNetCommandMsg(msg, temprelay);
1546-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d", msg->getID(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), i));
1546+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d", msg->getID(), GetNetCommandTypeAsString(msg->getNetCommandType()), i));
15471547
}
15481548
}
15491549
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ FrameDataReturnType FrameData::allCommandsReady(Bool debugSpewage) {
123123
DEBUG_LOG(("FrameData::allCommandsReady - There are more commands than there should be (%d, should be %d). Commands in command list are...", m_commandCount, m_frameCommandCount));
124124
NetCommandRef *ref = m_commandList->getFirstMessage();
125125
while (ref != NULL) {
126-
DEBUG_LOG(("%s, frame = %d, id = %d", GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(), ref->getCommand()->getExecutionFrame(), ref->getCommand()->getID()));
126+
DEBUG_LOG(("%s, frame = %d, id = %d", GetNetCommandTypeAsString(ref->getCommand()->getNetCommandType()), ref->getCommand()->getExecutionFrame(), ref->getCommand()->getID()));
127127
ref = ref->getNext();
128128
}
129129
DEBUG_LOG(("FrameData::allCommandsReady - End of command list."));
@@ -174,7 +174,7 @@ void FrameData::addCommand(NetCommandMsg *msg) {
174174
m_commandList->addMessage(msg);
175175

176176
++m_commandCount;
177-
//DEBUG_LOG(("added command %d, type = %d(%s), command count = %d, frame command count = %d", msg->getID(), msg->getNetCommandType(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), m_commandCount, m_frameCommandCount));
177+
//DEBUG_LOG(("added command %d, type = %d(%s), command count = %d, frame command count = %d", msg->getID(), msg->getNetCommandType(), GetNetCommandTypeAsString(msg->getNetCommandType()), m_commandCount, m_frameCommandCount));
178178
}
179179

180180
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void FrameDataManager::update() {
9090
void FrameDataManager::addNetCommandMsg(NetCommandMsg *msg) {
9191
UnsignedInt frame = msg->getExecutionFrame();
9292
UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
93-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("FrameDataManager::addNetCommandMsg - about to add a command of type %s for frame %d, frame index %d", GetAsciiNetCommandType(msg->getNetCommandType()).str(), frame, frameindex));
93+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("FrameDataManager::addNetCommandMsg - about to add a command of type %s for frame %d, frame index %d", GetNetCommandTypeAsString(msg->getNetCommandType()), frame, frameindex));
9494
m_frameData[frameindex].addCommand(msg);
9595

9696
if (m_isLocal) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4967,7 +4967,7 @@ NetCommandList * NetPacket::getCommandList() {
49674967

49684968
NetCommandMsg *msg = NULL;
49694969

4970-
//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList() - command of type %d(%s)", commandType, GetAsciiNetCommandType((NetCommandType)commandType).str()));
4970+
//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList() - command of type %d(%s)", commandType, GetNetCommandTypeAsString((NetCommandType)commandType)));
49714971

49724972
switch((NetCommandType)commandType)
49734973
{

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

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -203,70 +203,70 @@ Bool CommandRequiresDirectSend(NetCommandMsg *msg) {
203203
return FALSE;
204204
}
205205

206-
AsciiString GetAsciiNetCommandType(NetCommandType type) {
207-
AsciiString s;
208-
if (type == NETCOMMANDTYPE_FRAMEINFO) {
209-
s.set("NETCOMMANDTYPE_FRAMEINFO");
210-
} else if (type == NETCOMMANDTYPE_GAMECOMMAND) {
211-
s.set("NETCOMMANDTYPE_GAMECOMMAND");
212-
} else if (type == NETCOMMANDTYPE_PLAYERLEAVE) {
213-
s.set("NETCOMMANDTYPE_PLAYERLEAVE");
214-
} else if (type == NETCOMMANDTYPE_RUNAHEADMETRICS) {
215-
s.set("NETCOMMANDTYPE_RUNAHEADMETRICS");
216-
} else if (type == NETCOMMANDTYPE_RUNAHEAD) {
217-
s.set("NETCOMMANDTYPE_RUNAHEAD");
218-
} else if (type == NETCOMMANDTYPE_DESTROYPLAYER) {
219-
s.set("NETCOMMANDTYPE_DESTROYPLAYER");
220-
} else if (type == NETCOMMANDTYPE_ACKBOTH) {
221-
s.set("NETCOMMANDTYPE_ACKBOTH");
222-
} else if (type == NETCOMMANDTYPE_ACKSTAGE1) {
223-
s.set("NETCOMMANDTYPE_ACKSTAGE1");
224-
} else if (type == NETCOMMANDTYPE_ACKSTAGE2) {
225-
s.set("NETCOMMANDTYPE_ACKSTAGE2");
226-
} else if (type == NETCOMMANDTYPE_FRAMEINFO) {
227-
s.set("NETCOMMANDTYPE_FRAMEINFO");
228-
} else if (type == NETCOMMANDTYPE_KEEPALIVE) {
229-
s.set("NETCOMMANDTYPE_KEEPALIVE");
230-
} else if (type == NETCOMMANDTYPE_DISCONNECTCHAT) {
231-
s.set("NETCOMMANDTYPE_DISCONNECTCHAT");
232-
} else if (type == NETCOMMANDTYPE_CHAT) {
233-
s.set("NETCOMMANDTYPE_CHAT");
234-
} else if (type == NETCOMMANDTYPE_MANGLERQUERY) {
235-
s.set("NETCOMMANDTYPE_MANGLERQUERY");
236-
} else if (type == NETCOMMANDTYPE_MANGLERRESPONSE) {
237-
s.set("NETCOMMANDTYPE_MANGLERRESPONSE");
238-
} else if (type == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
239-
s.set("NETCOMMANDTYPE_DISCONNECTKEEPALIVE");
240-
} else if (type == NETCOMMANDTYPE_DISCONNECTPLAYER) {
241-
s.set("NETCOMMANDTYPE_DISCONNECTPLAYER");
242-
} else if (type == NETCOMMANDTYPE_PACKETROUTERQUERY) {
243-
s.set("NETCOMMANDTYPE_PACKETROUTERQUERY");
244-
} else if (type == NETCOMMANDTYPE_PACKETROUTERACK) {
245-
s.set("NETCOMMANDTYPE_PACKETROUTERACK");
246-
} else if (type == NETCOMMANDTYPE_DISCONNECTVOTE) {
247-
s.set("NETCOMMANDTYPE_DISCONNECTVOTE");
248-
} else if (type == NETCOMMANDTYPE_PROGRESS) {
249-
s.set("NETCOMMANDTYPE_PROGRESS");
250-
} else if (type == NETCOMMANDTYPE_LOADCOMPLETE) {
251-
s.set("NETCOMMANDTYPE_LOADCOMPLETE");
252-
} else if (type == NETCOMMANDTYPE_TIMEOUTSTART) {
253-
s.set("NETCOMMANDTYPE_TIMEOUTSTART");
254-
} else if (type == NETCOMMANDTYPE_WRAPPER) {
255-
s.set("NETCOMMANDTYPE_WRAPPER");
256-
} else if (type == NETCOMMANDTYPE_FILE) {
257-
s.set("NETCOMMANDTYPE_FILE");
258-
} else if (type == NETCOMMANDTYPE_FILEANNOUNCE) {
259-
s.set("NETCOMMANDTYPE_FILEANNOUNCE");
260-
} else if (type == NETCOMMANDTYPE_FILEPROGRESS) {
261-
s.set("NETCOMMANDTYPE_FILEPROGRESS");
262-
} else if (type == NETCOMMANDTYPE_DISCONNECTFRAME) {
263-
s.set("NETCOMMANDTYPE_DISCONNECTFRAME");
264-
} else if (type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
265-
s.set("NETCOMMANDTYPE_DISCONNECTSCREENOFF");
266-
} else if (type == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
267-
s.set("NETCOMMANDTYPE_FRAMERESENDREQUEST");
268-
} else {
269-
s.set("UNKNOWN");
206+
const char* GetNetCommandTypeAsString(NetCommandType type) {
207+
208+
switch (type) {
209+
case NETCOMMANDTYPE_ACKBOTH:
210+
return "NETCOMMANDTYPE_ACKBOTH";
211+
case NETCOMMANDTYPE_ACKSTAGE1:
212+
return "NETCOMMANDTYPE_ACKSTAGE1";
213+
case NETCOMMANDTYPE_ACKSTAGE2:
214+
return "NETCOMMANDTYPE_ACKSTAGE2";
215+
case NETCOMMANDTYPE_FRAMEINFO:
216+
return "NETCOMMANDTYPE_FRAMEINFO";
217+
case NETCOMMANDTYPE_GAMECOMMAND:
218+
return "NETCOMMANDTYPE_GAMECOMMAND";
219+
case NETCOMMANDTYPE_PLAYERLEAVE:
220+
return "NETCOMMANDTYPE_PLAYERLEAVE";
221+
case NETCOMMANDTYPE_RUNAHEADMETRICS:
222+
return "NETCOMMANDTYPE_RUNAHEADMETRICS";
223+
case NETCOMMANDTYPE_RUNAHEAD:
224+
return "NETCOMMANDTYPE_RUNAHEAD";
225+
case NETCOMMANDTYPE_DESTROYPLAYER:
226+
return "NETCOMMANDTYPE_DESTROYPLAYER";
227+
case NETCOMMANDTYPE_KEEPALIVE:
228+
return "NETCOMMANDTYPE_KEEPALIVE";
229+
case NETCOMMANDTYPE_DISCONNECTCHAT:
230+
return "NETCOMMANDTYPE_DISCONNECTCHAT";
231+
case NETCOMMANDTYPE_CHAT:
232+
return "NETCOMMANDTYPE_CHAT";
233+
case NETCOMMANDTYPE_MANGLERQUERY:
234+
return "NETCOMMANDTYPE_MANGLERQUERY";
235+
case NETCOMMANDTYPE_MANGLERRESPONSE:
236+
return "NETCOMMANDTYPE_MANGLERRESPONSE";
237+
case NETCOMMANDTYPE_PROGRESS:
238+
return "NETCOMMANDTYPE_PROGRESS";
239+
case NETCOMMANDTYPE_LOADCOMPLETE:
240+
return "NETCOMMANDTYPE_LOADCOMPLETE";
241+
case NETCOMMANDTYPE_TIMEOUTSTART:
242+
return "NETCOMMANDTYPE_TIMEOUTSTART";
243+
case NETCOMMANDTYPE_WRAPPER:
244+
return "NETCOMMANDTYPE_WRAPPER";
245+
case NETCOMMANDTYPE_FILE:
246+
return "NETCOMMANDTYPE_FILE";
247+
case NETCOMMANDTYPE_FILEANNOUNCE:
248+
return "NETCOMMANDTYPE_FILEANNOUNCE";
249+
case NETCOMMANDTYPE_FILEPROGRESS:
250+
return "NETCOMMANDTYPE_FILEPROGRESS";
251+
case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
252+
return "NETCOMMANDTYPE_DISCONNECTKEEPALIVE";
253+
case NETCOMMANDTYPE_DISCONNECTPLAYER:
254+
return "NETCOMMANDTYPE_DISCONNECTPLAYER";
255+
case NETCOMMANDTYPE_PACKETROUTERQUERY:
256+
return "NETCOMMANDTYPE_PACKETROUTERQUERY";
257+
case NETCOMMANDTYPE_PACKETROUTERACK:
258+
return "NETCOMMANDTYPE_PACKETROUTERACK";
259+
case NETCOMMANDTYPE_DISCONNECTVOTE:
260+
return "NETCOMMANDTYPE_DISCONNECTVOTE";
261+
case NETCOMMANDTYPE_DISCONNECTFRAME:
262+
return "NETCOMMANDTYPE_DISCONNECTFRAME";
263+
case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
264+
return "NETCOMMANDTYPE_DISCONNECTSCREENOFF";
265+
case NETCOMMANDTYPE_FRAMERESENDREQUEST:
266+
return "NETCOMMANDTYPE_FRAMERESENDREQUEST";
267+
default:
268+
DEBUG_CRASH(("Unknown NetCommandType in GetNetCommandTypeAsString"));
269+
return "UNKNOWN";
270270
}
271-
return s;
271+
272272
}

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Bool DoesCommandRequireACommandID(NetCommandType type);
3737
Bool CommandRequiresAck(NetCommandMsg *msg);
3838
Bool CommandRequiresDirectSend(NetCommandMsg *msg);
3939
Bool IsCommandSynchronized(NetCommandType type);
40-
AsciiString GetAsciiNetCommandType(NetCommandType type);
40+
const char* GetNetCommandTypeAsString(NetCommandType type);
4141

4242
#ifdef DEBUG_LOGGING
4343
extern "C" {

‎GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ void Connection::debugPrintCommands() {
416416
NetCommandRef *ref = m_netCommandList->getFirstMessage();
417417
while (ref != NULL) {
418418
DEBUG_LOG(("Connection::debugPrintCommands - ID: %d\tType: %s\tRelay: 0x%X for frame %d",
419-
ref->getCommand()->getID(), GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(),
419+
ref->getCommand()->getID(), GetNetCommandTypeAsString(ref->getCommand()->getNetCommandType()),
420420
ref->getRelay(), ref->getCommand()->getExecutionFrame()));
421421
ref = ref->getNext();
422422
}

‎GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void ConnectionManager::doRelay() {
364364
// Iterate through the commands in this packet and send them to the proper connections.
365365
while (cmd != NULL) {
366366
//DEBUG_LOG(("ConnectionManager::doRelay() - Looking at a command of type %s",
367-
//GetAsciiNetCommandType(cmd->getCommand()->getNetCommandType()).str()));
367+
//GetNetCommandTypeAsString(cmd->getCommand()->getNetCommandType())));
368368
if (CommandRequiresAck(cmd->getCommand())) {
369369
ackCommand(cmd, m_localSlot);
370370
}
@@ -1115,12 +1115,12 @@ void ConnectionManager::sendRemoteCommand(NetCommandRef *msg) {
11151115
}
11161116

11171117
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - sending net command %d of type %s from player %d, relay is 0x%x",
1118-
msg->getCommand()->getID(), GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getRelay()));
1118+
msg->getCommand()->getID(), GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getRelay()));
11191119

11201120
UnsignedByte relay = msg->getRelay();
11211121
if ((relay & (1 << m_localSlot)) && (m_frameData[msg->getCommand()->getPlayerID()] != NULL)) {
11221122
if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
1123-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
1123+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
11241124
m_frameData[msg->getCommand()->getPlayerID()]->addNetCommandMsg(msg->getCommand());
11251125
}
11261126
}
@@ -1486,10 +1486,10 @@ void ConnectionManager::sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay
14861486
msg->attach();
14871487

14881488
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - sending net command %d of type %s", msg->getID(),
1489-
GetAsciiNetCommandType(msg->getNetCommandType()).str()));
1489+
GetNetCommandTypeAsString(msg->getNetCommandType())));
14901490

14911491
if (relay & (1 << m_localSlot)) {
1492-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
1492+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
14931493
m_frameData[m_localSlot]->addNetCommandMsg(msg);
14941494
}
14951495

@@ -1533,7 +1533,7 @@ void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte
15331533

15341534
if (((relay & (1 << m_localSlot)) != 0) && (m_frameData[m_localSlot] != NULL)) {
15351535
if (IsCommandSynchronized(msg->getNetCommandType()) == TRUE) {
1536-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
1536+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
15371537
m_frameData[m_localSlot]->addNetCommandMsg(msg);
15381538
}
15391539
}
@@ -1543,7 +1543,7 @@ void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte
15431543
if ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) {
15441544
UnsignedByte temprelay = 1 << i;
15451545
m_connections[i]->sendNetCommandMsg(msg, temprelay);
1546-
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d", msg->getID(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), i));
1546+
DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d", msg->getID(), GetNetCommandTypeAsString(msg->getNetCommandType()), i));
15471547
}
15481548
}
15491549
}

0 commit comments

Comments
 (0)