Skip to content

Commit e3f5589

Browse files
author
Ibra
committed
fix: Restore obs overlay and notification keymapping after merge
1 parent fb82070 commit e3f5589

3 files changed

Lines changed: 44 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,6 +2291,7 @@ void InGameUI::reset()
22912291

22922292
m_windowLayouts.clear();
22932293

2294+
m_observerStatsHidden = false;
22942295
m_observerNotifications.clear();
22952296
m_observerMilestones.clear();
22962297

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3500,6 +3500,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
35003500
}
35013501

35023502
ToggleControlBar();
3503+
TheInGameUI->toggleObserverStats();
35033504
}
35043505
disp = DESTROY_MESSAGE;
35053506
break;

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,48 @@ void MetaMap::generateMetaMap()
808808
// TheSuperHackers @info A default mapping for MSG_META_SELECT_ALL_AIRCRAFT would be useful for Generals
809809
// but is not recommended, because it will cause key mapping conflicts with original game languages.
810810

811+
{
812+
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_OBSERVER_NOTIFICATION_FONT);
813+
if (map->m_key == MK_NONE)
814+
{
815+
map->m_key = MK_RIGHT;
816+
map->m_transition = DOWN;
817+
map->m_modState = SHIFT;
818+
map->m_usableIn = COMMANDUSABLE_GAME;
819+
}
820+
}
821+
{
822+
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_OBSERVER_NOTIFICATION_FONT);
823+
if (map->m_key == MK_NONE)
824+
{
825+
map->m_key = MK_LEFT;
826+
map->m_transition = DOWN;
827+
map->m_modState = SHIFT;
828+
map->m_usableIn = COMMANDUSABLE_GAME;
829+
}
830+
}
831+
832+
{
833+
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_OBSERVER_STATS_FONT);
834+
if (map->m_key == MK_NONE)
835+
{
836+
map->m_key = MK_UP;
837+
map->m_transition = DOWN;
838+
map->m_modState = SHIFT;
839+
map->m_usableIn = COMMANDUSABLE_GAME;
840+
}
841+
}
842+
{
843+
844+
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_OBSERVER_STATS_FONT);
845+
if (map->m_key == MK_NONE)
846+
{
847+
map->m_key = MK_DOWN;
848+
map->m_transition = DOWN;
849+
map->m_modState = SHIFT;
850+
map->m_usableIn = COMMANDUSABLE_GAME;
851+
}
852+
}
811853
{
812854
// Is useful for Generals and Zero Hour.
813855
MetaMapRec *map = getMetaMapRec(GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS);

0 commit comments

Comments
 (0)