Skip to content

Commit 3063bf7

Browse files
committed
Address review comments
1 parent 473950e commit 3063bf7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,13 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
10191019
{
10201020
switch (t)
10211021
{
1022+
case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
1023+
case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
1024+
case GameMessage::MSG_META_DEMO_FREE_BUILD:
1025+
case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
1026+
// Usable in multiplayer!
1027+
return false;
1028+
10221029
case GameMessage::MSG_META_DEMO_SWITCH_TEAMS:
10231030
case GameMessage::MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA:
10241031
case GameMessage::MSG_META_DEMO_KILL_ALL_ENEMIES:
@@ -1028,9 +1035,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
10281035
case GameMessage::MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS:
10291036
case GameMessage::MSG_META_DEMO_TIME_OF_DAY:
10301037
case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES:
1031-
//case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
1032-
//case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
1033-
//case GameMessage::MSG_META_DEMO_FREE_BUILD:
10341038
case GameMessage::MSG_META_DEMO_RUNSCRIPT1:
10351039
case GameMessage::MSG_META_DEMO_RUNSCRIPT2:
10361040
case GameMessage::MSG_META_DEMO_RUNSCRIPT3:
@@ -1066,7 +1070,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
10661070
case GameMessage::MSG_DEBUG_HURT_OBJECT:
10671071
case GameMessage::MSG_DEBUG_KILL_OBJECT:
10681072
case GameMessage::MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS:
1069-
//case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
10701073
case GameMessage::MSG_META_DEMO_GIVE_RANKLEVEL:
10711074
case GameMessage::MSG_META_DEMO_TAKE_RANKLEVEL:
10721075
case GameMessage::MSG_META_DEBUG_WIN:

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,18 @@ void giveAllSciences(Player* player)
147147
}
148148
}
149149

150-
void objectUnderConstruction(Object* obj, void *userData)
150+
void objectUnderConstruction(Object* obj, void *underConstruction)
151151
{
152152
if (obj->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
153153
{
154-
*(Bool*)userData = true;
154+
*(Bool*)underConstruction = true;
155155
return;
156156
}
157157

158158
ProductionUpdateInterface *pui = ProductionUpdate::getProductionUpdateInterfaceFromObject(obj);
159159
if(pui != NULL && pui->getProductionCount() > 0)
160160
{
161-
*(Bool*)userData = true;
161+
*(Bool*)underConstruction = true;
162162
return;
163163
}
164164
}

0 commit comments

Comments
 (0)