From e04b6c957590e14d6a7f264e2c41a519440a4732 Mon Sep 17 00:00:00 2001
From: a <e>
Date: Sun, 18 Aug 2024 01:31:28 +0300
Subject: [PATCH] use a global constant for invalid image handle

---
 dll/dll/settings.h       |  2 ++
 dll/settings.cpp         |  4 ++++
 dll/steam_user_stats.cpp | 12 ++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dll/dll/settings.h b/dll/dll/settings.h
index 559c0fa1..eaf33228 100644
--- a/dll/dll/settings.h
+++ b/dll/dll/settings.h
@@ -215,6 +215,8 @@ private:
     std::string supported_languages{};
 
 public:
+    constexpr const static int INVALID_IMAGE_HANDLE = 0;
+
     //Depots
     std::vector<DepotId_t> depots{};
 
diff --git a/dll/settings.cpp b/dll/settings.cpp
index 531fbd0f..844e5375 100644
--- a/dll/settings.cpp
+++ b/dll/settings.cpp
@@ -375,6 +375,10 @@ int Settings::add_image(const std::string &data, uint32 width, uint32 height)
 
 Image_Data* Settings::get_image(int handle)
 {
+    if (INVALID_IMAGE_HANDLE == handle) {
+        return nullptr;
+    }
+    
     auto image_it = images.find(handle);
     if (images.end() == image_it) {
         return nullptr;
diff --git a/dll/steam_user_stats.cpp b/dll/steam_user_stats.cpp
index ac43ba3c..a1774cde 100644
--- a/dll/steam_user_stats.cpp
+++ b/dll/steam_user_stats.cpp
@@ -135,19 +135,19 @@ int Steam_User_Stats::load_ach_icon(const nlohmann::json &defined_ach, bool achi
 
     std::string icon_filepath = defined_ach.value(icon_key, std::string{});
     if (icon_filepath.empty()) {
-        return 0; // bad handle
+        return Settings::INVALID_IMAGE_HANDLE;
     }
 
     std::string file_path(Local_Storage::get_game_settings_path() + icon_filepath);
     unsigned int file_size = file_size_(file_path);
     if (!file_size) {
-        return 0; // bad handle
+        return Settings::INVALID_IMAGE_HANDLE;
     }
 
     int icon_size = static_cast<int>(settings->overlay_appearance.icon_size);
     std::string img(Local_Storage::load_image_resized(file_path, "", icon_size));
     if (img.empty()) {
-        return 0; // bad handle
+        return Settings::INVALID_IMAGE_HANDLE;
     }
 
     return settings->add_image(img, icon_size, icon_size);
@@ -1173,7 +1173,7 @@ int Steam_User_Stats::GetAchievementIcon( const char *pchName )
 {
     PRINT_DEBUG("'%s'", pchName);
     std::lock_guard<std::recursive_mutex> lock(global_mutex);
-    if (!pchName) return 0;
+    if (!pchName) return Settings::INVALID_IMAGE_HANDLE;
 
     bool achieved = false;
     GetAchievement(pchName, &achieved);
@@ -1195,13 +1195,13 @@ int Steam_User_Stats::get_achievement_icon_handle( const std::string &ach_name,
 {
     PRINT_DEBUG("'%s', %i", ach_name.c_str(), (int)achieved);
     std::lock_guard<std::recursive_mutex> lock(global_mutex);
-    if (ach_name.empty()) return 0;
+    if (ach_name.empty()) return Settings::INVALID_IMAGE_HANDLE;
 
     nlohmann::detail::iter_impl<nlohmann::json> it = defined_achievements.end();
     try {
         it = defined_achievements_find(ach_name);
     } catch(...) { }
-    if (defined_achievements.end() == it) return 0;
+    if (defined_achievements.end() == it) return Settings::INVALID_IMAGE_HANDLE;
 
     int handle = 0; // bad handle
     try {