1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2025-09-10 12:03:06 +02:00

comply with requests

This commit is contained in:
Detanup01 2025-07-10 18:28:23 +02:00 committed by GitHub
parent 29ff78364f
commit 8540ab58a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 8 deletions

View file

@ -17,7 +17,6 @@
#include "dll/settings.h"
#include "dll/steam_app_ids.h"
#include <fstream>
// Global Steam ID call counter for savegame system
uint32 Settings::global_steamid_call_count = 0;
@ -105,7 +104,8 @@ CGameID Settings::get_local_game_id()
// alt or local steam id
CSteamID Settings::get_current_steam_id()
{
global_steamid_call_count++;
if (global_steamid_call_count < UINT32_MAX)
global_steamid_call_count++;
if (alt_steamid_count == 0 || !alt_steamid.IsValid()) {
return steam_id;

View file

@ -679,19 +679,17 @@ static CSteamID parse_alt_steam_id(class Local_Storage* local_storage)
static uint32 parse_alt_steamid_count(class Local_Storage* local_storage)
{
uint32 count = static_cast<uint32>(ini.GetLongValue("user::general", "alt_steamid_count"));
if (count < 0) {
count = 0;
}
PRINT_DEBUG("Alt Steam ID count: %u", (uint32)count);
return (uint32)count;
}
// user::general::ticket
static void parse_encrypted_app_ticket(Settings* settings)
static void parse_encrypted_app_ticket(class Settings *settings_client, class Settings *settings_server)
{
std::string ticketValue(common_helpers::string_strip(ini.GetValue("user::general", "ticket", "")));
if (ticketValue.size()) {
settings->customEncryptedAppTicket = base64_decode(ticketValue);
settings_client->customEncryptedAppTicket = base64_decode(ticketValue);
settings_server->customEncryptedAppTicket = base64_decode(ticketValue);
}
}
@ -1854,7 +1852,7 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
parse_auto_accept_invite(settings_client, settings_server);
parse_ip_country(local_storage, settings_client, settings_server);
parse_encrypted_app_ticket(settings_client);
parse_encrypted_app_ticket(settings_client, settings_server);
// try local "steam_settings" then saves path, on second trial force load defaults
if (!parse_branches_file(steam_settings_path, false, settings_client, settings_server, local_storage)) {