[Refactor] #3236 ANGBAND_DIR_XTRA をconcptr からpath に差し替えた

sikabane-works · Jan 28, 2024 · 9ece32f · 9ece32f
1 parent 29e28f9
commit 9ece32f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main-win.cpp b/src/main-win.cpp
@@ -519,7 +519,6 @@ static void load_prefs(void)
     GetPrivateProfileStringA("Angband", "BackGroundBitmap", DEFAULT_BG_FILENAME, wallpaper_file, 1023, ini_file);
     char savefile_buf[1024]{};
     GetPrivateProfileStringA("Angband", "SaveFile", "", savefile_buf, 1023, ini_file);
-
     if (strncmp(".\\", savefile_buf, 2) == 0) {
         std::string angband_dir_str(ANGBAND_DIR.string());
         const auto path_length = angband_dir_str.length() - 4; // "\lib" を除く.

diff --git a/src/main-win/graphics-win.cpp b/src/main-win/graphics-win.cpp
@@ -22,7 +22,7 @@ ULONG_PTR gdiplusToken;
 // interface object
 Graphics graphic{};
 
-concptr ANGBAND_DIR_XTRA_GRAF;
+std::filesystem::path ANGBAND_DIR_XTRA_GRAF;
 
 /*!
  * 現在使用中のタイルID(0ならば未使用)

diff --git a/src/main-win/graphics-win.h b/src/main-win/graphics-win.h
@@ -5,7 +5,7 @@
  */
 
 #include "system/h-type.h"
-
+#include <filesystem>
 #include <windows.h>
 
 /*
@@ -105,7 +105,7 @@ extern Graphics graphic;
 /*
  * Directory names
  */
-extern concptr ANGBAND_DIR_XTRA_GRAF;
+extern std::filesystem::path ANGBAND_DIR_XTRA_GRAF;
 
 /*!
  * @brief Creates a GDI bitmap from an image file