Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-23 19:25:35 +08:00
Code Issues 1 Projects Releases Wiki Activity

don't bypass local_storage in steam_friends class

Browse Source
This commit is contained in:
otavepto 2024-04-09 20:56:35 +02:00
parent 28da5747db
commit 53533ee4af
2 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dll/dll/steam_friends.h
View File

@ -47,6 +47,7 @@ public ISteamFriends016,
public ISteamFriends public ISteamFriends
{ {
class Settings *settings; class Settings *settings;
class Local_Storage* local_storage;
class Networking *network; class Networking *network;
class SteamCallBacks *callbacks; class SteamCallBacks *callbacks;
class SteamCallResults *callback_results; class SteamCallResults *callback_results;
@ -102,85 +103,55 @@ struct Avatar_Numbers add_friend_avatars(CSteamID id)
return avatar_ids->second; return avatar_ids->second;
} }
struct Avatar_Numbers avatar_numbers; struct Avatar_Numbers avatar_numbers{};
std::string small_avatar(32 * 32 * 4, 0); std::string small_avatar(32 * 32 * 4, 0);
std::string medium_avatar(64 * 64 * 4, 0); std::string medium_avatar(64 * 64 * 4, 0);
std::string large_avatar(184 * 184 * 4, 0); std::string large_avatar(184 * 184 * 4, 0);
if (!(settings->disable_account_avatar) && (id == settings->get_local_steam_id())) { static const std::initializer_list<std::string> avatar_icons = {
std::string file_path; "account_avatar.png",
unsigned long long file_size; "account_avatar.jpg",
"account_avatar.jpeg",
};
for (int i = 0; i < 3; i++) { if (!settings->disable_account_avatar && (id == settings->get_local_steam_id())) {
std::string file_name; std::string file_path{};
if (i == 0) file_name = "account_avatar.png"; unsigned long long file_size{};
if (i == 1) file_name = "account_avatar.jpg";
if (i == 2) file_name = "account_avatar.jpeg";
file_path = Local_Storage::get_game_settings_path() + file_name;
file_size = file_size_(file_path);
if (file_size) break;
}
if (!file_size) {
for (int i = 0; i < 3; i++) {
std::string file_name;
if (i == 0) file_name = "account_avatar.png";
if (i == 1) file_name = "account_avatar.jpg";
if (i == 2) file_name = "account_avatar.jpeg";
if (settings->local_save.length() > 0) {
file_path = settings->local_save + "/settings/" + file_name;
} else {
file_path = Local_Storage::get_user_appdata_path() + "/settings/" + file_name;
}
// try local location first, then try global location
for (const auto &settings_path : { Local_Storage::get_game_settings_path(), local_storage->get_global_settings_path() }) {
for (const auto &file_name : avatar_icons) {
file_path = settings_path + file_name;
file_size = file_size_(file_path); file_size = file_size_(file_path);
if (file_size) break; if (file_size) break;
} }
if (file_size) break;
} }
// no else statement here for default or else this breaks default images for friends // no else statement here for default otherwise this breaks default images for friends
if (file_size) { if (file_size) {
small_avatar = Local_Storage::load_image_resized(file_path, "", 32); small_avatar = Local_Storage::load_image_resized(file_path, "", 32);
medium_avatar = Local_Storage::load_image_resized(file_path, "", 64); medium_avatar = Local_Storage::load_image_resized(file_path, "", 64);
large_avatar = Local_Storage::load_image_resized(file_path, "", 184); large_avatar = Local_Storage::load_image_resized(file_path, "", 184);
} }
} else if (!(settings->disable_account_avatar)) { } else if (!settings->disable_account_avatar) {
Friend *f = find_friend(id); Friend *f = find_friend(id);
if (f && (large_avatar.compare(f->avatar()) != 0)) { if (f && (large_avatar.compare(f->avatar()) != 0)) {
large_avatar = f->avatar(); large_avatar = f->avatar();
medium_avatar = Local_Storage::load_image_resized("", f->avatar(), 64); medium_avatar = Local_Storage::load_image_resized("", f->avatar(), 64);
small_avatar = Local_Storage::load_image_resized("", f->avatar(), 32); small_avatar = Local_Storage::load_image_resized("", f->avatar(), 32);
} else { } else {
std::string file_path; std::string file_path{};
unsigned long long file_size; unsigned long long file_size{};
for (int i = 0; i < 3; i++) {
std::string file_name;
if (i == 0) file_name = "account_avatar_default.png";
if (i == 1) file_name = "account_avatar_default.jpg";
if (i == 2) file_name = "account_avatar_default.jpeg";
file_path = Local_Storage::get_game_settings_path() + file_name;
file_size = file_size_(file_path);
if (file_size) break;
}
if (!file_size) {
for (int i = 0; i < 3; i++) {
std::string file_name;
if (i == 0) file_name = "account_avatar_default.png";
if (i == 1) file_name = "account_avatar_default.jpg";
if (i == 2) file_name = "account_avatar_default.jpeg";
if (settings->local_save.length() > 0) {
file_path = settings->local_save + "/settings/" + file_name;
} else {
file_path = Local_Storage::get_user_appdata_path() + "/settings/" + file_name;
}
// try local location first, then try global location
for (const auto &settings_path : { Local_Storage::get_game_settings_path(), local_storage->get_global_settings_path() }) {
for (const auto &file_name : avatar_icons) {
file_path = settings_path + file_name;
file_size = file_size_(file_path); file_size = file_size_(file_path);
if (file_size) break; if (file_size) break;
} }
if (file_size) break;
} }
if (file_size) { if (file_size) {
@ -221,8 +192,9 @@ void resend_friend_data()
modified = true; modified = true;
} }
Steam_Friends(Settings* settings, Networking* network, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Steam_Overlay* overlay): Steam_Friends(Settings* settings, class Local_Storage* local_storage, Networking* network, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Steam_Overlay* overlay):
settings(settings), settings(settings),
local_storage(local_storage),
network(network), network(network),
callbacks(callbacks), callbacks(callbacks),
callback_results(callback_results), callback_results(callback_results),

2
dll/steam_client.cpp
View File

@ -98,7 +98,7 @@ Steam_Client::Steam_Client()
steam_overlay = new Steam_Overlay(settings_client, callback_results_client, callbacks_client, run_every_runcb, network); steam_overlay = new Steam_Overlay(settings_client, callback_results_client, callbacks_client, run_every_runcb, network);
steam_user = new Steam_User(settings_client, local_storage, network, callback_results_client, callbacks_client); steam_user = new Steam_User(settings_client, local_storage, network, callback_results_client, callbacks_client);
steam_friends = new Steam_Friends(settings_client, network, callback_results_client, callbacks_client, run_every_runcb, steam_overlay); steam_friends = new Steam_Friends(settings_client, local_storage, network, callback_results_client, callbacks_client, run_every_runcb, steam_overlay);
steam_utils = new Steam_Utils(settings_client, callback_results_client, steam_overlay); steam_utils = new Steam_Utils(settings_client, callback_results_client, steam_overlay);
ugc_bridge = new Ugc_Remote_Storage_Bridge(settings_client); ugc_bridge = new Ugc_Remote_Storage_Bridge(settings_client);