Skip to content

feat(lobby): Add setting to disable alternate colors in lobby list #454

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
+25 −1
Open

feat(lobby): Add setting to disable alternate colors in lobby list #454

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
5 changes: 4 additions & 1 deletion Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,10 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
bool bAlternate = (rowCount % 2 == 0);
if (bAlternate && gameColor == GameSpyColor[GSCOLOR_GAME])
{
gameColor = GameMakeColor(191, 198, 201, 255);
if (NGMP_OnlineServicesManager::Settings.LobbyList_AlternateColors())
{
gameColor = GameMakeColor(191, 198, 201, 255);
}
}
Int index = GadgetListBoxAddEntryText(win, gameName, gameColor, -1, COLUMN_NAME);
GadgetListBoxSetItemData(win, (void*)gameID, index);
Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class GenOnlineSettings

bool Graphics_DrawStatsOverlay() const { return m_Render_DrawStatsOverlay; }
bool Graphics_LimitFramerate() const { return m_Render_LimitFramerate; }
bool LobbyList_AlternateColors() const { return m_LobbyList_AlternateColors; }
int Graphics_GetFPSLimit() const
{
if (!m_Render_LimitFramerate)
Expand Down Expand Up @@ -136,6 +137,8 @@ class GenOnlineSettings
bool m_Social_Notification_PlayerSendsRequest_Menus = true;
bool m_Social_Notification_PlayerSendsRequest_Gameplay = true;

bool m_LobbyList_AlternateColors = true;

EHTTPVersion m_Network_HTTPVersion = EHTTPVersion::HTTP_VERSION_AUTO;
bool m_Network_UseAlternativeEndpoint = false;
};
18 changes: 18 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
#define SETTINGS_KEY_SOCIAL_NOTIFICATIONS_PLAYER_SENDS_REQUEST_MENUS "notification_player_sends_request_menus"
#define SETTINGS_KEY_SOCIAL_NOTIFICATIONS_PLAYER_SENDS_REQUEST_GAMEPLAY "notification_player_sends_request_gameplay"

#define SETTINGS_KEY_LOBBY_LIST "lobby_list"
#define SETTINGS_KEY_LOBBY_LIST_ALTERNATE_COLORS "alternate_lobby_colors"

#define SETTINGS_KEY_DEBUG "debug"
#define SETTINGS_KEY_DEBUG_VERBOSE_LOGGING "verbose_logging"

Expand Down Expand Up @@ -245,6 +248,14 @@ void GenOnlineSettings::Load(void)
m_Social_Notification_PlayerSendsRequest_Gameplay = socialSettings[SETTINGS_KEY_SOCIAL_NOTIFICATIONS_PLAYER_SENDS_REQUEST_GAMEPLAY];
}
}

if (jsonSettings.contains(SETTINGS_KEY_LOBBY_LIST))
{
auto lobbyListSettings = jsonSettings[SETTINGS_KEY_LOBBY_LIST];

if (lobbyListSettings.contains(SETTINGS_KEY_LOBBY_LIST_ALTERNATE_COLORS))
m_LobbyList_AlternateColors = lobbyListSettings[SETTINGS_KEY_LOBBY_LIST_ALTERNATE_COLORS];
}
}

}
Expand Down Expand Up @@ -334,6 +345,13 @@ void GenOnlineSettings::Save()
{SETTINGS_KEY_SOCIAL_NOTIFICATIONS_PLAYER_SENDS_REQUEST_GAMEPLAY, m_Social_Notification_PlayerSendsRequest_Gameplay},
}
},

{
SETTINGS_KEY_LOBBY_LIST,
{
{SETTINGS_KEY_LOBBY_LIST_ALTERNATE_COLORS, m_LobbyList_AlternateColors},
}
},
};

std::string strData = root.dump(1);
Expand Down
Loading