Skip to content

Commit 0d850ca

Browse files
authored
refactor(network): Replace branches with switches in Network command parse functions (#1437)
1 parent 354ef18 commit 0d850ca

File tree

4 files changed

+690
-328
lines changed

4 files changed

+690
-328
lines changed

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

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,34 +176,48 @@ GameMessage *NetGameCommandMsg::constructGameMessage()
176176
AsciiString name;
177177
name.format("player%d", getPlayerID());
178178
retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerIndex());
179-
// retval->friend_setPlayerIndex(indexFromMask(ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerMask()));
180179

181180
GameMessageArgument *arg = m_argList;
182181
while (arg != NULL) {
183-
// retval->appendGenericArgument(arg->m_data);
184-
if (arg->m_type == ARGUMENTDATATYPE_INTEGER) {
182+
183+
switch (arg->m_type) {
184+
185+
case ARGUMENTDATATYPE_INTEGER:
185186
retval->appendIntegerArgument(arg->m_data.integer);
186-
} else if (arg->m_type == ARGUMENTDATATYPE_REAL) {
187+
break;
188+
case ARGUMENTDATATYPE_REAL:
187189
retval->appendRealArgument(arg->m_data.real);
188-
} else if (arg->m_type == ARGUMENTDATATYPE_BOOLEAN) {
190+
break;
191+
case ARGUMENTDATATYPE_BOOLEAN:
189192
retval->appendBooleanArgument(arg->m_data.boolean);
190-
} else if (arg->m_type == ARGUMENTDATATYPE_OBJECTID) {
193+
break;
194+
case ARGUMENTDATATYPE_OBJECTID:
191195
retval->appendObjectIDArgument(arg->m_data.objectID);
192-
} else if (arg->m_type == ARGUMENTDATATYPE_DRAWABLEID) {
196+
break;
197+
case ARGUMENTDATATYPE_DRAWABLEID:
193198
retval->appendDrawableIDArgument(arg->m_data.drawableID);
194-
} else if (arg->m_type == ARGUMENTDATATYPE_TEAMID) {
199+
break;
200+
case ARGUMENTDATATYPE_TEAMID:
195201
retval->appendTeamIDArgument(arg->m_data.teamID);
196-
} else if (arg->m_type == ARGUMENTDATATYPE_LOCATION) {
202+
break;
203+
case ARGUMENTDATATYPE_LOCATION:
197204
retval->appendLocationArgument(arg->m_data.location);
198-
} else if (arg->m_type == ARGUMENTDATATYPE_PIXEL) {
205+
break;
206+
case ARGUMENTDATATYPE_PIXEL:
199207
retval->appendPixelArgument(arg->m_data.pixel);
200-
} else if (arg->m_type == ARGUMENTDATATYPE_PIXELREGION) {
208+
break;
209+
case ARGUMENTDATATYPE_PIXELREGION:
201210
retval->appendPixelRegionArgument(arg->m_data.pixelRegion);
202-
} else if (arg->m_type == ARGUMENTDATATYPE_TIMESTAMP) {
211+
break;
212+
case ARGUMENTDATATYPE_TIMESTAMP:
203213
retval->appendTimestampArgument(arg->m_data.timestamp);
204-
} else if (arg->m_type == ARGUMENTDATATYPE_WIDECHAR) {
214+
break;
215+
case ARGUMENTDATATYPE_WIDECHAR:
205216
retval->appendWideCharArgument(arg->m_data.wChar);
217+
break;
218+
206219
}
220+
207221
arg = arg->m_next;
208222
}
209223
return retval;

0 commit comments

Comments
 (0)