Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2025-01-12 10:29:32 +08:00
Code Issues 1 Projects Releases Wiki Activity

don't bypass local_storage in steam_overlay class

Browse Source
This commit is contained in:
otavepto 2024-04-09 21:00:19 +02:00
parent 53533ee4af
commit 22fc5038a2
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
overlay_experimental/overlay/steam_overlay.h
View File

@ -104,11 +104,12 @@ class Steam_Overlay
{ {
constexpr static const char ACH_FALLBACK_DIR[] = "achievement_images"; constexpr static const char ACH_FALLBACK_DIR[] = "achievement_images";
Settings* settings; class Settings* settings;
SteamCallResults* callback_results; class Local_Storage* local_storage;
SteamCallBacks* callbacks; class SteamCallResults* callback_results;
RunEveryRunCB* run_every_runcb; class SteamCallBacks* callbacks;
Networking* network; class RunEveryRunCB* run_every_runcb;
class Networking* network;
// friend id, show client window (to chat and accept invite maybe) // friend id, show client window (to chat and accept invite maybe)
std::map<Friend, friend_window_state, Friend_Less> friends{}; std::map<Friend, friend_window_state, Friend_Less> friends{};
@ -223,7 +224,7 @@ class Steam_Overlay
void steam_run_callback(); void steam_run_callback();
public: public:
Steam_Overlay(Settings* settings, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking *network); Steam_Overlay(Settings* settings, Local_Storage *local_storage, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking *network);
~Steam_Overlay(); ~Steam_Overlay();
@ -258,7 +259,7 @@ public:
class Steam_Overlay class Steam_Overlay
{ {
public: public:
Steam_Overlay(Settings* settings, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking* network) {} Steam_Overlay(Settings* settings, Local_Storage *local_storage, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking* network) {}
~Steam_Overlay() {} ~Steam_Overlay() {}
bool Ready() const { return false; } bool Ready() const { return false; }

9
overlay_experimental/steam_overlay.cpp
View File

@ -100,8 +100,9 @@ void Steam_Overlay::overlay_networking_callback(void* object, Common_Message* ms
_this->networking_msg_received(msg); _this->networking_msg_received(msg);
} }
Steam_Overlay::Steam_Overlay(Settings* settings, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking* network) : Steam_Overlay::Steam_Overlay(Settings* settings, Local_Storage *local_storage, SteamCallResults* callback_results, SteamCallBacks* callbacks, RunEveryRunCB* run_every_runcb, Networking* network) :
settings(settings), settings(settings),
local_storage(local_storage),
callback_results(callback_results), callback_results(callback_results),
callbacks(callbacks), callbacks(callbacks),
run_every_runcb(run_every_runcb), run_every_runcb(run_every_runcb),
@ -328,11 +329,7 @@ void Steam_Overlay::load_audio()
file_path = Local_Storage::get_game_settings_path() + file_name; file_path = Local_Storage::get_game_settings_path() + file_name;
file_size = file_size_(file_path); file_size = file_size_(file_path);
if (!file_size) { if (!file_size) {
if (settings->local_save.length() > 0) { file_path = local_storage->get_global_settings_path() + file_name;
file_path = settings->local_save + "/settings/" + file_name;
} else {
file_path = Local_Storage::get_user_appdata_path() + "/settings/" + file_name;
}
file_size = file_size_(file_path); file_size = file_size_(file_path);
} }
if (file_size) { if (file_size) {