Skip to content

fix: Restore obs overlay and notification keymapping and fix f9 toggling after merge #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Restore obs overlay and notification keymapping and fix f9 toggling after merge #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ Bool RecorderClass::playbackFile(AsciiString filename)

Bool isMultiplayer = (m_originalGameMode == GAME_INTERNET || m_originalGameMode == GAME_LAN);
m_crcInfo = CRCInfo(header.localPlayerIndex, isMultiplayer);
DEBUG_LOG(("Player index is %d, replay CRC interval is %d, isMultiplayer is %d", m_crcInfo->getLocalPlayer(), REPLAY_CRC_INTERVAL, isMultiplayer));
DEBUG_LOG(("Player index is %d, replay CRC interval is %d, isMultiplayer is %d", m_crcInfo.getLocalPlayer(), REPLAY_CRC_INTERVAL, isMultiplayer));

DEBUG_LOG(("RecorderClass::playbackFile() - original game was mode %d", m_originalGameMode));

Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2291,6 +2291,7 @@ void InGameUI::reset()

m_windowLayouts.clear();

m_observerStatsHidden = false;
m_observerNotifications.clear();
m_observerMilestones.clear();

Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3500,6 +3500,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
}

ToggleControlBar();
TheInGameUI->toggleObserverStats();
}
disp = DESTROY_MESSAGE;
break;
Expand Down
42 changes: 42 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,48 @@ void MetaMap::generateMetaMap()
// TheSuperHackers @info A default mapping for MSG_META_SELECT_ALL_AIRCRAFT would be useful for Generals
// but is not recommended, because it will cause key mapping conflicts with original game languages.

{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_OBSERVER_NOTIFICATION_FONT);
if (map->m_key == MK_NONE)
{
map->m_key = MK_RIGHT;
map->m_transition = DOWN;
map->m_modState = SHIFT;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}
{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_OBSERVER_NOTIFICATION_FONT);
if (map->m_key == MK_NONE)
{
map->m_key = MK_LEFT;
map->m_transition = DOWN;
map->m_modState = SHIFT;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}

{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_OBSERVER_STATS_FONT);
if (map->m_key == MK_NONE)
{
map->m_key = MK_UP;
map->m_transition = DOWN;
map->m_modState = SHIFT;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}
{

MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_OBSERVER_STATS_FONT);
if (map->m_key == MK_NONE)
{
map->m_key = MK_DOWN;
map->m_transition = DOWN;
map->m_modState = SHIFT;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}
{
// Is useful for Generals and Zero Hour.
MetaMapRec *map = getMetaMapRec(GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS);
Expand Down
Loading