Skip to content

Commit 8a06f35

Browse files
xezonxezon
authored
unify(message): Merge MessageStream, MetaEvent code (TheSuperHackers#2756)
1 parent cc4a683 commit 8a06f35

5 files changed

Lines changed: 125 additions & 9 deletions

File tree

‎Generals/Code/GameEngine/Include/Common/MessageStream.h‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ class GameMessage : public MemoryPoolObject
272272
MSG_META_BEGIN_CAMERA_ZOOM_OUT,
273273
MSG_META_END_CAMERA_ZOOM_OUT,
274274
MSG_META_CAMERA_RESET,
275+
MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE,
275276
MSG_META_TOGGLE_FAST_FORWARD_REPLAY, ///< Toggle the fast forward feature
276277
MSG_META_TOGGLE_PAUSE, ///< TheSuperHackers @feature Toggle game pause
277278
MSG_META_TOGGLE_PAUSE_ALT, ///< TheSuperHackers @feature Toggle game pause (alternative mapping)
@@ -280,6 +281,30 @@ class GameMessage : public MemoryPoolObject
280281
MSG_META_DEMO_INSTANT_QUIT, ///< bail out of game immediately
281282

282283

284+
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
285+
MSG_CHEAT_RUNSCRIPT1, ///< run script named "KEY_F1"
286+
MSG_CHEAT_RUNSCRIPT2, ///< run script named "KEY_F2"
287+
MSG_CHEAT_RUNSCRIPT3, ///< run script named "KEY_F3"
288+
MSG_CHEAT_RUNSCRIPT4, ///< run script named "KEY_F4"
289+
MSG_CHEAT_RUNSCRIPT5, ///< run script named "KEY_F5"
290+
MSG_CHEAT_RUNSCRIPT6, ///< run script named "KEY_F6"
291+
MSG_CHEAT_RUNSCRIPT7, ///< run script named "KEY_F7"
292+
MSG_CHEAT_RUNSCRIPT8, ///< run script named "KEY_F8"
293+
MSG_CHEAT_RUNSCRIPT9, ///< run script named "KEY_F9"
294+
MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS, ///< Toggle special power delays on/off
295+
MSG_CHEAT_SWITCH_TEAMS, ///< switch local control to another team
296+
MSG_CHEAT_KILL_SELECTION, ///< kill the selected units (yeah!)
297+
MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE, ///< do 100% damage to the selected units (w00t!)
298+
MSG_CHEAT_INSTANT_BUILD, ///< All building is with a timer of 1
299+
MSG_CHEAT_DESHROUD, ///< de-shroud the world for the local player
300+
MSG_CHEAT_ADD_CASH, ///< adds 10000 cash to the player
301+
MSG_CHEAT_GIVE_ALL_SCIENCES, ///< grant all grantable sciences
302+
MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS, ///< give yourself an SPP (but no rank change)
303+
MSG_CHEAT_SHOW_HEALTH, ///< show object health
304+
MSG_CHEAT_TOGGLE_MESSAGE_TEXT, ///< hides/shows the onscreen messages
305+
306+
#endif
307+
283308
// META items that are really for debug/demo/development use only...
284309
// They do not get built into RELEASE builds.
285310
#if defined(RTS_DEBUG)
@@ -339,10 +364,12 @@ class GameMessage : public MemoryPoolObject
339364
MSG_META_DEMO_ENSHROUD, ///< re-shroud the world for the local player
340365
MSG_META_DEMO_DESHROUD, ///< de-shroud the world for the local player
341366
MSG_META_DEBUG_SHOW_EXTENTS, ///< show object extents
342-
MSG_META_DEBUG_SHOW_HEALTH, ///< show object health
367+
MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS, ///< show audio objects and radii
368+
MSG_META_DEBUG_SHOW_HEALTH, ///< show object health
343369
MSG_META_DEBUG_GIVE_VETERANCY, ///< give a veterancy level to selected objects
344370
MSG_META_DEBUG_TAKE_VETERANCY, ///< take a veterancy level from selected objects
345371
MSG_META_DEMO_TOGGLE_AI_DEBUG, ///< show/hide the ai debug stats
372+
MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT, ///<start/stop dumping to file all thoughts about placing SupplyCenters
346373
MSG_META_DEMO_TOGGLE_CAMERA_DEBUG, ///< show/hide the camera debug stats
347374
MSG_META_DEMO_TOGGLE_AVI, ///< start capturing video
348375
MSG_META_DEMO_TOGGLE_BW_VIEW, ///< enable/disable black & white camera mode
@@ -393,6 +420,9 @@ class GameMessage : public MemoryPoolObject
393420
MSG_META_DEBUG_TOGGLE_NETWORK, ///< toggle between having and not having network traffic.
394421
MSG_META_DEBUG_DUMP_PLAYER_OBJECTS, ///< Dump numbers of objects owned by each player to the script debug window
395422
MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS, ///< Dump numbers of objects owned by each player to the script debug window, and additional object info
423+
MSG_META_DEBUG_OBJECT_ID_PERFORMANCE, ///< Run a mess of ObjectID lookups to see performance
424+
MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE, ///< Run a mess of DrawableID lookups to see performance
425+
MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE, ///< Peek at the size of the sleepy update vector
396426

397427
MSG_META_DEBUG_WIN, ///< Instant Win
398428
MSG_META_DEMO_TOGGLE_DEBUG_STATS, ///< show/hide the debug stats
@@ -434,6 +464,7 @@ class GameMessage : public MemoryPoolObject
434464
MSG_ADD_WAYPOINT_HINT, ///< (location) If clicked, a waypoint will be added for currently selected units.
435465
//Context command hints
436466
MSG_HIJACK_HINT, ///< if clicked, selected unit(s) will attempt to take over vehicle.
467+
MSG_SABOTAGE_HINT,
437468
MSG_FIREBOMB_HINT, ///< throw a molotov cocktail
438469
MSG_CONVERT_TO_CARBOMB_HINT, ///< if clicked, selected unit(s) will attempt to convert clicked object into a carbomb.
439470
MSG_CAPTUREBUILDING_HINT,
@@ -576,7 +607,7 @@ class GameMessage : public MemoryPoolObject
576607

577608
MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900, ///< network messages that exist only in debug/internal builds. all grouped separately.
578609

579-
#if defined(RTS_DEBUG)
610+
#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
580611
// all debug/internal-only messages must go here.
581612
MSG_DEBUG_KILL_SELECTION,
582613
MSG_DEBUG_HURT_OBJECT,

‎Generals/Code/GameEngine/Source/Common/MessageStream.cpp‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,37 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
377377
CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT)
378378
CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT)
379379
CASE_LABEL(MSG_META_CAMERA_RESET)
380+
CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE)
380381
CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
381382
CASE_LABEL(MSG_META_TOGGLE_PAUSE)
382383
CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
383384
CASE_LABEL(MSG_META_STEP_FRAME)
384385
CASE_LABEL(MSG_META_STEP_FRAME_ALT)
385386
CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT)
386387

388+
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
389+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT1)
390+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT2)
391+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT3)
392+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT4)
393+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT5)
394+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT6)
395+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT7)
396+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT8)
397+
CASE_LABEL(MSG_CHEAT_RUNSCRIPT9)
398+
CASE_LABEL(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS)
399+
CASE_LABEL(MSG_CHEAT_SWITCH_TEAMS)
400+
CASE_LABEL(MSG_CHEAT_KILL_SELECTION)
401+
CASE_LABEL(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE)
402+
CASE_LABEL(MSG_CHEAT_INSTANT_BUILD)
403+
CASE_LABEL(MSG_CHEAT_DESHROUD)
404+
CASE_LABEL(MSG_CHEAT_ADD_CASH)
405+
CASE_LABEL(MSG_CHEAT_GIVE_ALL_SCIENCES)
406+
CASE_LABEL(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS)
407+
CASE_LABEL(MSG_CHEAT_SHOW_HEALTH)
408+
CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT)
409+
#endif
410+
387411
#if defined(RTS_DEBUG)
388412
CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
389413
CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX)
@@ -441,10 +465,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
441465
CASE_LABEL(MSG_META_DEMO_ENSHROUD)
442466
CASE_LABEL(MSG_META_DEMO_DESHROUD)
443467
CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS)
468+
CASE_LABEL(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS)
444469
CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH)
445470
CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY)
446471
CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY)
447472
CASE_LABEL(MSG_META_DEMO_TOGGLE_AI_DEBUG)
473+
CASE_LABEL(MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT)
448474
CASE_LABEL(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG)
449475
CASE_LABEL(MSG_META_DEMO_TOGGLE_AVI)
450476
CASE_LABEL(MSG_META_DEMO_TOGGLE_BW_VIEW)
@@ -494,6 +520,9 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
494520
CASE_LABEL(MSG_META_DEBUG_TOGGLE_NETWORK)
495521
CASE_LABEL(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS)
496522
CASE_LABEL(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS)
523+
CASE_LABEL(MSG_META_DEBUG_OBJECT_ID_PERFORMANCE)
524+
CASE_LABEL(MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE)
525+
CASE_LABEL(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE)
497526
CASE_LABEL(MSG_META_DEBUG_WIN)
498527
CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS)
499528
#endif // defined(RTS_DEBUG)
@@ -529,6 +558,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
529558
CASE_LABEL(MSG_DO_ATTACKMOVETO_HINT)
530559
CASE_LABEL(MSG_ADD_WAYPOINT_HINT)
531560
CASE_LABEL(MSG_HIJACK_HINT)
561+
CASE_LABEL(MSG_SABOTAGE_HINT)
532562
CASE_LABEL(MSG_FIREBOMB_HINT)
533563
CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
534564
CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
@@ -642,9 +672,10 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
642672
CASE_LABEL(MSG_CREATE_FORMATION)
643673
CASE_LABEL(MSG_LOGIC_CRC)
644674
CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
675+
CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
645676
CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES)
646677

647-
#if defined(RTS_DEBUG)
678+
#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
648679
CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
649680
CASE_LABEL(MSG_DEBUG_HURT_OBJECT)
650681
CASE_LABEL(MSG_DEBUG_KILL_OBJECT)
@@ -1006,7 +1037,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
10061037
// TheSuperHackers @tweak Debug cheats are now multiplayer compatible. Happy cheating Munkees :)
10071038
return false;
10081039

1009-
case GameMessage::MSG_META_DEMO_INSTANT_QUIT:
10101040
case GameMessage::MSG_META_DEMO_SWITCH_TEAMS:
10111041
case GameMessage::MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA:
10121042
case GameMessage::MSG_META_DEMO_KILL_ALL_ENEMIES:

‎Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@
5353

5454
#include "GameLogic/GameLogic.h" // for TheGameLogic->getFrame()
5555

56+
57+
#define dont_DUMP_ALL_KEYS_TO_LOG
58+
59+
60+
#ifdef DUMP_ALL_KEYS_TO_LOG
61+
#include "GameClient/Keyboard.h"
62+
#endif
63+
5664
MetaMap *TheMetaMap = nullptr;
5765

5866

@@ -174,15 +182,41 @@ static const LookupListRec GameMessageMetaTypeNames[] =
174182
{ "BEGIN_CAMERA_ZOOM_OUT", GameMessage::MSG_META_BEGIN_CAMERA_ZOOM_OUT },
175183
{ "END_CAMERA_ZOOM_OUT", GameMessage::MSG_META_END_CAMERA_ZOOM_OUT },
176184
{ "CAMERA_RESET", GameMessage::MSG_META_CAMERA_RESET },
185+
{ "TOGGLE_CAMERA_TRACKING_DRAWABLE", GameMessage::MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE },
177186
{ "TOGGLE_FAST_FORWARD_REPLAY", GameMessage::MSG_META_TOGGLE_FAST_FORWARD_REPLAY },
178187
{ "TOGGLE_PAUSE", GameMessage::MSG_META_TOGGLE_PAUSE },
179188
{ "TOGGLE_PAUSE_ALT", GameMessage::MSG_META_TOGGLE_PAUSE_ALT },
180189
{ "STEP_FRAME", GameMessage::MSG_META_STEP_FRAME },
181190
{ "STEP_FRAME_ALT", GameMessage::MSG_META_STEP_FRAME_ALT },
182191
{ "DEMO_INSTANT_QUIT", GameMessage::MSG_META_DEMO_INSTANT_QUIT },
183192

193+
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
194+
{ "CHEAT_RUNSCRIPT1", GameMessage::MSG_CHEAT_RUNSCRIPT1 },
195+
{ "CHEAT_RUNSCRIPT2", GameMessage::MSG_CHEAT_RUNSCRIPT2 },
196+
{ "CHEAT_RUNSCRIPT3", GameMessage::MSG_CHEAT_RUNSCRIPT3 },
197+
{ "CHEAT_RUNSCRIPT4", GameMessage::MSG_CHEAT_RUNSCRIPT4 },
198+
{ "CHEAT_RUNSCRIPT5", GameMessage::MSG_CHEAT_RUNSCRIPT5 },
199+
{ "CHEAT_RUNSCRIPT6", GameMessage::MSG_CHEAT_RUNSCRIPT6 },
200+
{ "CHEAT_RUNSCRIPT7", GameMessage::MSG_CHEAT_RUNSCRIPT7 },
201+
{ "CHEAT_RUNSCRIPT8", GameMessage::MSG_CHEAT_RUNSCRIPT8 },
202+
{ "CHEAT_RUNSCRIPT9", GameMessage::MSG_CHEAT_RUNSCRIPT9 },
203+
{ "CHEAT_TOGGLE_SPECIAL_POWER_DELAYS", GameMessage::MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS },
204+
{ "CHEAT_SWITCH_TEAMS", GameMessage::MSG_CHEAT_SWITCH_TEAMS },
205+
{ "CHEAT_KILL_SELECTION", GameMessage::MSG_CHEAT_KILL_SELECTION },
206+
{ "CHEAT_TOGGLE_HAND_OF_GOD_MODE", GameMessage::MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE },
207+
{ "CHEAT_INSTANT_BUILD", GameMessage::MSG_CHEAT_INSTANT_BUILD },
208+
{ "CHEAT_DESHROUD", GameMessage::MSG_CHEAT_DESHROUD },
209+
{ "CHEAT_ADD_CASH", GameMessage::MSG_CHEAT_ADD_CASH },
210+
{ "CHEAT_GIVE_ALL_SCIENCES", GameMessage::MSG_CHEAT_GIVE_ALL_SCIENCES },
211+
{ "CHEAT_GIVE_SCIENCEPURCHASEPOINTS", GameMessage::MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS },
212+
{ "CHEAT_SHOW_HEALTH", GameMessage::MSG_CHEAT_SHOW_HEALTH },
213+
{ "CHEAT_TOGGLE_MESSAGE_TEXT", GameMessage::MSG_CHEAT_TOGGLE_MESSAGE_TEXT },
214+
215+
#endif
216+
184217
#if defined(RTS_DEBUG)
185218
{ "HELP", GameMessage::MSG_META_HELP },
219+
186220
{ "DEMO_TOGGLE_BEHIND_BUILDINGS", GameMessage::MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS },
187221
{ "DEMO_LOD_DECREASE", GameMessage::MSG_META_DEMO_LOD_DECREASE },
188222
{ "DEMO_LOD_INCREASE", GameMessage::MSG_META_DEMO_LOD_INCREASE },
@@ -250,7 +284,8 @@ static const LookupListRec GameMessageMetaTypeNames[] =
250284
{ "DEMO_TOGGLE_GREEN_VIEW", GameMessage::MSG_META_DEMO_TOGGLE_GREEN_VIEW },
251285
{ "DEMO_TOGGLE_MOTION_BLUR_ZOOM", GameMessage::MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM },
252286
{ "DEMO_SHOW_EXTENTS", GameMessage::MSG_META_DEBUG_SHOW_EXTENTS },
253-
{ "DEMO_SHOW_HEALTH", GameMessage::MSG_META_DEBUG_SHOW_HEALTH },
287+
{ "DEMO_SHOW_AUDIO_LOCATIONS", GameMessage::MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS },
288+
{ "DEMO_SHOW_HEALTH", GameMessage::MSG_META_DEBUG_SHOW_HEALTH },
254289
{ "DEMO_GIVE_VETERANCY", GameMessage::MSG_META_DEBUG_GIVE_VETERANCY },
255290
{ "DEMO_TAKE_VETERANCY", GameMessage::MSG_META_DEBUG_TAKE_VETERANCY },
256291
{ "DEMO_BATTLE_CRY", GameMessage::MSG_META_DEMO_BATTLE_CRY },
@@ -266,6 +301,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
266301
{ "DEMO_DESHROUD", GameMessage::MSG_META_DEMO_DESHROUD },
267302
{ "DEMO_ENSHROUD", GameMessage::MSG_META_DEMO_ENSHROUD },
268303
{ "DEMO_TOGGLE_AI_DEBUG", GameMessage::MSG_META_DEMO_TOGGLE_AI_DEBUG },
304+
{ "DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT", GameMessage::MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT },
269305
{ "DEMO_TOGGLE_NO_DRAW", GameMessage::MSG_NO_DRAW },
270306
{ "DEMO_CYCLE_LOD_LEVEL", GameMessage::MSG_META_DEMO_CYCLE_LOD_LEVEL },
271307
{ "DEMO_DUMP_ASSETS", GameMessage::MSG_META_DEBUG_DUMP_ASSETS},
@@ -302,6 +338,9 @@ static const LookupListRec GameMessageMetaTypeNames[] =
302338
{ "DEBUG_DUMP_ALL_PLAYER_OBJECTS", GameMessage::MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS },
303339
{ "DEMO_WIN", GameMessage::MSG_META_DEBUG_WIN },
304340
{ "DEMO_TOGGLE_DEBUG_STATS", GameMessage::MSG_META_DEMO_TOGGLE_DEBUG_STATS },
341+
{ "DEBUG_OBJECT_ID_PERFORMANCE", GameMessage::MSG_META_DEBUG_OBJECT_ID_PERFORMANCE },
342+
{ "DEBUG_DRAWABLE_ID_PERFORMANCE", GameMessage::MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE },
343+
{ "DEBUG_SLEEPY_UPDATE_PERFORMANCE", GameMessage::MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE },
305344
#endif // defined(RTS_DEBUG)
306345

307346

@@ -499,9 +538,28 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
499538
}
500539
}
501540

541+
542+
502543
if (t == GameMessage::MSG_RAW_KEY_DOWN)
544+
{
503545
m_lastKeyDown = key;
504-
m_lastModState = newModState;
546+
547+
548+
#ifdef DUMP_ALL_KEYS_TO_LOG
549+
550+
WideChar Wkey = TheKeyboard->getPrintableKey(key, 0);
551+
UnicodeString uKey;
552+
uKey.set(&Wkey);
553+
AsciiString aKey;
554+
aKey.translate(uKey);
555+
DEBUG_LOG(("^%s ", aKey.str()));
556+
#endif
557+
558+
}
559+
560+
561+
562+
m_lastModState = newModState;
505563
}
506564

507565

‎GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,6 @@ class GameMessage : public MemoryPoolObject
614614
MSG_DEBUG_KILL_OBJECT,
615615
#endif
616616

617-
618-
619617
//*********************************************************************************************************
620618
MSG_END_NETWORK_MESSAGES = 1999, ///< MARKER TO DELINEATE MESSAGES THAT GO OVER THE NETWORK
621619
//*********************************************************************************************************

‎GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
465465
newModState |= ALT;
466466
}
467467

468-
469468
for (const MetaMapRec *map = TheMetaMap->getFirstMetaMapRec(); map; map = map->m_next)
470469
{
471470
if (!isMessageUsable(map->m_usableIn))

0 commit comments

Comments
 (0)