parse the new disable_overlay_warning_*.txt settings + fixed or condition of warn_forced_setting

This commit is contained in:
otavepto 2023-12-29 01:52:20 +02:00
parent 5dd51bd7b3
commit 2fa2a9229c
2 changed files with 50 additions and 23 deletions

View File

@ -242,7 +242,18 @@ public:
bool disable_overlay = false; bool disable_overlay = false;
bool disable_overlay_achievement_notification = false; bool disable_overlay_achievement_notification = false;
bool disable_overlay_friend_notification = false; bool disable_overlay_friend_notification = false;
bool disable_overlay_warning = false; //warn people who use force_ settings
bool overlay_warn_forced_setting = false;
//warn people who use local save
bool overlay_warn_local_save = false;
//disable overlay warning for force_ settings
bool disable_overlay_warning_forced_setting = false;
//disable overlay warning for local save
bool disable_overlay_warning_local_save = false;
//disable overlay warning for bad app ID (= 0)
bool disable_overlay_warning_bad_appid = false;
// disable all overlay warnings
bool disable_overlay_warning_any = false;
Overlay_Appearance overlay_appearance; Overlay_Appearance overlay_appearance;
//app build id //app build id
@ -254,11 +265,7 @@ public:
//make lobby creation fail in the matchmaking interface //make lobby creation fail in the matchmaking interface
bool disable_lobby_creation = false; bool disable_lobby_creation = false;
//warn people who use force_ settings // path to local save
bool warn_forced = false;
//warn people who use local save
bool warn_local_save = false;
std::string local_save; std::string local_save;
//steamhttp external download support //steamhttp external download support
@ -267,11 +274,10 @@ public:
//steam deck flag //steam deck flag
bool steam_deck = false; bool steam_deck = false;
// can use GC token for generation
bool use_gc_token = false;
// use new app_ticket auth instead of old one // use new app_ticket auth instead of old one
bool enable_new_app_ticket = false; bool enable_new_app_ticket = false;
// can use GC token for generation
bool use_gc_token = false;
}; };
#endif #endif

View File

@ -1110,7 +1110,10 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
bool disable_overlay = false; bool disable_overlay = false;
bool disable_overlay_achievement_notification = false; bool disable_overlay_achievement_notification = false;
bool disable_overlay_friend_notification = false; bool disable_overlay_friend_notification = false;
bool disable_overlay_warning = false; bool disable_overlay_warning_forced_setting = false;
bool disable_overlay_warning_local_save = false;
bool disable_overlay_warning_bad_appid = false;
bool disable_overlay_warning_any = false;
bool disable_lobby_creation = false; bool disable_lobby_creation = false;
bool disable_source_query = false; bool disable_source_query = false;
bool disable_account_avatar = false; bool disable_account_avatar = false;
@ -1120,7 +1123,7 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
bool enable_new_app_ticket = false; bool enable_new_app_ticket = false;
int build_id = 10; int build_id = 10;
bool warn_forced = false; bool warn_forced_setting = false;
// boolean flags and forced configurations // boolean flags and forced configurations
{ {
@ -1143,8 +1146,14 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
disable_overlay_achievement_notification = true; disable_overlay_achievement_notification = true;
} else if (p == "disable_overlay_friend_notification.txt") { } else if (p == "disable_overlay_friend_notification.txt") {
disable_overlay_friend_notification = true; disable_overlay_friend_notification = true;
} else if (p == "disable_overlay_warning.txt") { } else if (p == "disable_overlay_warning_forced_setting.txt") {
disable_overlay_warning = true; disable_overlay_warning_forced_setting = true;
} else if (p == "disable_overlay_warning_local_save.txt") {
disable_overlay_warning_local_save = true;
} else if (p == "disable_overlay_warning_bad_appid.txt") {
disable_overlay_warning_bad_appid = true;
} else if (p == "disable_overlay_warning_any.txt") {
disable_overlay_warning_any = true;
} else if (p == "disable_lobby_creation.txt") { } else if (p == "disable_lobby_creation.txt") {
disable_lobby_creation = true; disable_lobby_creation = true;
} else if (p == "disable_source_query.txt") { } else if (p == "disable_source_query.txt") {
@ -1156,13 +1165,13 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
} else if (p == "is_beta_branch.txt") { } else if (p == "is_beta_branch.txt") {
is_beta_branch = true; is_beta_branch = true;
} else if (p == "force_language.txt") { } else if (p == "force_language.txt") {
warn_forced = parse_force_language(language, steam_settings_path); warn_forced_setting |= parse_force_language(language, steam_settings_path);
} else if (p == "force_steamid.txt") { } else if (p == "force_steamid.txt") {
warn_forced = parse_force_user_steam_id(user_id, steam_settings_path); warn_forced_setting |= parse_force_user_steam_id(user_id, steam_settings_path);
} else if (p == "force_account_name.txt") { } else if (p == "force_account_name.txt") {
warn_forced = parse_force_account_name(name, steam_settings_path); warn_forced_setting |= parse_force_account_name(name, steam_settings_path);
} else if (p == "force_listen_port.txt") { } else if (p == "force_listen_port.txt") {
warn_forced = parse_force_listen_port(port, steam_settings_path); warn_forced_setting |= parse_force_listen_port(port, steam_settings_path);
} else if (p == "build_id.txt") { } else if (p == "build_id.txt") {
parse_build_id(build_id, steam_settings_path); parse_build_id(build_id, steam_settings_path);
} else if (p == "new_app_ticket.txt") { } else if (p == "new_app_ticket.txt") {
@ -1181,14 +1190,30 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
settings_server->custom_broadcasts = custom_broadcasts; settings_server->custom_broadcasts = custom_broadcasts;
settings_client->disable_networking = disable_networking; settings_client->disable_networking = disable_networking;
settings_server->disable_networking = disable_networking; settings_server->disable_networking = disable_networking;
settings_client->disable_overlay = disable_overlay; settings_client->disable_overlay = disable_overlay;
settings_server->disable_overlay = disable_overlay; settings_server->disable_overlay = disable_overlay;
settings_client->disable_overlay_achievement_notification = disable_overlay_achievement_notification; settings_client->disable_overlay_achievement_notification = disable_overlay_achievement_notification;
settings_server->disable_overlay_achievement_notification = disable_overlay_achievement_notification; settings_server->disable_overlay_achievement_notification = disable_overlay_achievement_notification;
settings_client->disable_overlay_friend_notification = disable_overlay_friend_notification; settings_client->disable_overlay_friend_notification = disable_overlay_friend_notification;
settings_server->disable_overlay_friend_notification = disable_overlay_friend_notification; settings_server->disable_overlay_friend_notification = disable_overlay_friend_notification;
settings_client->disable_overlay_warning = disable_overlay_warning; // overlay warning for forced setting
settings_server->disable_overlay_warning = disable_overlay_warning; settings_client->overlay_warn_forced_setting = warn_forced_setting;
settings_server->overlay_warn_forced_setting = warn_forced_setting;
settings_client->disable_overlay_warning_forced_setting = disable_overlay_warning_forced_setting;
settings_server->disable_overlay_warning_forced_setting = disable_overlay_warning_forced_setting;
// overlay warning for local save
settings_client->overlay_warn_local_save = local_save;
settings_server->overlay_warn_local_save = local_save;
settings_client->disable_overlay_warning_local_save = disable_overlay_warning_local_save;
settings_server->disable_overlay_warning_local_save = disable_overlay_warning_local_save;
// overlay warning for bad app ID (= 0)
settings_client->disable_overlay_warning_bad_appid = disable_overlay_warning_bad_appid;
settings_server->disable_overlay_warning_bad_appid = disable_overlay_warning_bad_appid;
// disable any overlay warning
settings_client->disable_overlay_warning_any = disable_overlay_warning_any;
settings_server->disable_overlay_warning_any = disable_overlay_warning_any;
settings_client->disable_lobby_creation = disable_lobby_creation; settings_client->disable_lobby_creation = disable_lobby_creation;
settings_server->disable_lobby_creation = disable_lobby_creation; settings_server->disable_lobby_creation = disable_lobby_creation;
settings_client->disable_source_query = disable_source_query; settings_client->disable_source_query = disable_source_query;
@ -1197,10 +1222,6 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
settings_server->disable_account_avatar = disable_account_avatar; settings_server->disable_account_avatar = disable_account_avatar;
settings_client->build_id = build_id; settings_client->build_id = build_id;
settings_server->build_id = build_id; settings_server->build_id = build_id;
settings_client->warn_forced = warn_forced;
settings_server->warn_forced = warn_forced;
settings_client->warn_local_save = local_save;
settings_server->warn_local_save = local_save;
settings_client->supported_languages = supported_languages; settings_client->supported_languages = supported_languages;
settings_server->supported_languages = supported_languages; settings_server->supported_languages = supported_languages;
settings_client->steam_deck = steam_deck_mode; settings_client->steam_deck = steam_deck_mode;