Skip to content

Commit e58a8ab

Browse files
committed
Changed the order of translators.
To provent the meta event translator from 'eating up' hotkey events.
1 parent 0ea269a commit e58a8ab

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ void GameClient::init( void )
289289

290290
// since we only allocate one of each, don't bother pooling 'em
291291
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") WindowTranslator, 10 );
292-
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") MetaEventTranslator, 20 );
293-
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") HotKeyTranslator, 25 );
292+
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") HotKeyTranslator, 20 );
293+
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") MetaEventTranslator, 25 );
294294
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") PlaceEventTranslator, 30 );
295295
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") GUICommandTranslator, 40 );
296296
m_translators[ m_numTranslators++ ] = TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") SelectionTranslator, 50 );

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,6 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
500500

501501
if( keyState & KEY_STATE_AUTOREPEAT )
502502
{
503-
if (!newModState)
504-
{
505-
if (const Drawable *selectedDrawable = TheInGameUI->getFirstSelectedDrawable())
506-
{
507-
if (const Object *tempObject = selectedDrawable->getObject())
508-
{
509-
if (tempObject->isKindOf(KINDOF_STRUCTURE))
510-
{
511-
// keep message for hotkey
512-
disp = KEEP_MESSAGE;
513-
break;
514-
}
515-
}
516-
}
517-
}
518-
519503
// if it's an autorepeat of a "known" key, don't generate the meta-event,
520504
// but DO eat the keystroke so no one else can mess with it
521505
//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() auto-repeat: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));

0 commit comments

Comments
 (0)