jackcartersmith/gse
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Merge branch 'Detanup01:dev' into dev

Browse Source
This commit is contained in:
alex47exe 2024-09-02 12:19:29 +01:00 committed by GitHub
commit 3fbe0d3ec6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dll/local_storage.cpp
View File

@ -17,14 +17,17 @@
#include "dll/local_storage.h" #include "dll/local_storage.h"
#if defined(__WINDOWS__)
// NOTE: stb_image_write
#define STBIW_WINDOWS_UTF8
// NOTE: stb_image
#define STBI_WINDOWS_UTF8
#endif
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_STATIC #define STB_IMAGE_STATIC
#define STBI_ONLY_PNG #define STBI_ONLY_PNG
#define STBI_ONLY_JPEG #define STBI_ONLY_JPEG
#if defined(__WINDOWS__)
#define STBI_WINDOWS_UTF8
#define STBIW_WINDOWS_UTF8
#endif
#include "stb/stb_image.h" #include "stb/stb_image.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION
@ -32,6 +35,7 @@
#include "stb/stb_image_write.h" #include "stb/stb_image_write.h"
#define STB_IMAGE_RESIZE_IMPLEMENTATION #define STB_IMAGE_RESIZE_IMPLEMENTATION
#define STB_IMAGE_RESIZE_STATIC
#include "stb/stb_image_resize2.h" #include "stb/stb_image_resize2.h"
struct File_Data { struct File_Data {
@ -813,7 +817,8 @@ bool Local_Storage::load_json(const std::string &full_path, nlohmann::json& json
PRINT_DEBUG("Loaded json '%s' (%zu items)", full_path.c_str(), json.size()); PRINT_DEBUG("Loaded json '%s' (%zu items)", full_path.c_str(), json.size());
return true; return true;
} catch (const std::exception& e) { } catch (const std::exception& e) {
PRINT_DEBUG("Error while parsing '%s' json error: %s", full_path.c_str(), e.what()); const char *errorMessage = e.what();
PRINT_DEBUG("Error while parsing '%s' json error: %s", full_path.c_str(), errorMessage);
} }
} else { } else {
PRINT_DEBUG("Couldn't open file '%s' to read json", full_path.c_str()); PRINT_DEBUG("Couldn't open file '%s' to read json", full_path.c_str());

3
dll/settings_parser.cpp
View File

@ -1053,7 +1053,8 @@ static void try_parse_mods_file(class Settings *settings_client, Settings *setti
PRINT_DEBUG(" workshop_item_url: '%s'", newMod.workshopItemURL.c_str()); PRINT_DEBUG(" workshop_item_url: '%s'", newMod.workshopItemURL.c_str());
PRINT_DEBUG(" preview_url: '%s'", newMod.previewURL.c_str()); PRINT_DEBUG(" preview_url: '%s'", newMod.previewURL.c_str());
} catch (std::exception& e) { } catch (std::exception& e) {
PRINT_DEBUG("MODLOADER ERROR: %s", e.what()); const char *errorMessage = e.what();
PRINT_DEBUG("MODLOADER ERROR: %s", errorMessage);
} }
} }
} }

3
dll/steam_user_stats_stats.cpp
View File

@ -582,7 +582,8 @@ bool Steam_User_Stats::ResetAllStats( bool bAchievementsToo )
// this won't actually trigger a notification, just updates the data // this won't actually trigger a notification, just updates the data
overlay->AddAchievementNotification(name, item, false); overlay->AddAchievementNotification(name, item, false);
} catch(const std::exception& e) { } catch(const std::exception& e) {
PRINT_DEBUG("ERROR: %s", e.what()); const char *errorMessage = e.what();
PRINT_DEBUG("ERROR: %s", errorMessage);
} }
} }
if (needs_disk_write) save_achievements(); if (needs_disk_write) save_achievements();