[Refactor] #38861 cptr を concptrに改名 / rename cptr to concptr.

[hengband/hengband.git] / src / main-win.c

diff --git a/src/main-win.c b/src/main-win.c
index 63fc8b9..555e331 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -310,7 +310,7 @@
 #else /* WIN32 */\r
 #define FA_LABEL    0x08        /* Volume label */\r
 #define FA_DIREC    0x10        /* Directory */\r
-unsigned _cdecl _dos_getfileattr(cptr , unsigned *);\r
+unsigned _cdecl _dos_getfileattr(concptr , unsigned *);\r
 #endif /* WIN32 */\r
 \r
 /*\r
@@ -391,7 +391,7 @@ typedef struct _term_data term_data;
 struct _term_data\r
 {\r
        term t;\r
-       cptr s;\r
+       concptr s;\r
        HWND w;\r
        DWORD dwStyle;\r
        DWORD dwExStyle;\r
@@ -413,8 +413,8 @@ struct _term_data
        bool xtra_hack;\r
        bool visible;\r
        bool bizarre;\r
-       cptr font_want;\r
-       cptr font_file;\r
+       concptr font_want;\r
+       concptr font_file;\r
        HFONT font_id;\r
        int font_wid;  //!< フォント横幅\r
        int font_hgt;  //!< フォント縦幅\r
@@ -531,7 +531,7 @@ static bool can_use_sound = FALSE;
 /*\r
  * An array of sound file names\r
  */\r
-static cptr sound_file[SOUND_MAX][SAMPLE_MAX];\r
+static concptr sound_file[SOUND_MAX][SAMPLE_MAX];\r
 \r
 #endif /* USE_SOUND */\r
 \r
@@ -540,10 +540,10 @@ static cptr sound_file[SOUND_MAX][SAMPLE_MAX];
 #ifdef USE_MUSIC\r
 \r
 #define SAMPLE_MUSIC_MAX 16\r
-static cptr music_file[MUSIC_BASIC_MAX][SAMPLE_MUSIC_MAX];\r
-static cptr dungeon_music_file[1000][SAMPLE_MUSIC_MAX];\r
-static cptr town_music_file[1000][SAMPLE_MUSIC_MAX];\r
-static cptr quest_music_file[1000][SAMPLE_MUSIC_MAX];\r
+static concptr music_file[MUSIC_BASIC_MAX][SAMPLE_MUSIC_MAX];\r
+static concptr dungeon_music_file[1000][SAMPLE_MUSIC_MAX];\r
+static concptr town_music_file[1000][SAMPLE_MUSIC_MAX];\r
+static concptr quest_music_file[1000][SAMPLE_MUSIC_MAX];\r
 static bool can_use_music = FALSE;\r
 \r
 static MCI_OPEN_PARMS mop;\r
@@ -558,30 +558,30 @@ int current_music_id = 0;
 /*\r
  * Full path to ANGBAND.INI\r
  */\r
-static cptr ini_file = NULL;\r
+static concptr ini_file = NULL;\r
 \r
 /*\r
  * Name of application\r
  */\r
-static cptr AppName = "ANGBAND";\r
+static concptr AppName = "ANGBAND";\r
 \r
 /*\r
  * Name of sub-window type\r
  */\r
-static cptr AngList = "AngList";\r
+static concptr AngList = "AngList";\r
 \r
 /*\r
  * Directory names\r
  */\r
-static cptr ANGBAND_DIR_XTRA_GRAF;\r
-static cptr ANGBAND_DIR_XTRA_SOUND;\r
-static cptr ANGBAND_DIR_XTRA_MUSIC;\r
-static cptr ANGBAND_DIR_XTRA_HELP;\r
+static concptr ANGBAND_DIR_XTRA_GRAF;\r
+static concptr ANGBAND_DIR_XTRA_SOUND;\r
+static concptr ANGBAND_DIR_XTRA_MUSIC;\r
+static concptr ANGBAND_DIR_XTRA_HELP;\r
 #if 0 /* #ifndef JP */\r
-static cptr ANGBAND_DIR_XTRA_FONT;\r
+static concptr ANGBAND_DIR_XTRA_FONT;\r
 #endif\r
 #ifdef USE_MUSIC\r
-static cptr ANGBAND_DIR_XTRA_MUSIC;\r
+static concptr ANGBAND_DIR_XTRA_MUSIC;\r
 #endif\r
 \r
 \r
@@ -824,9 +824,9 @@ static void DrawBG(HDC hdc, RECT *r)
 /*\r
  * Hack -- given a pathname, point at the filename\r
  */\r
-static cptr extract_file_name(cptr s)\r
+static concptr extract_file_name(concptr s)\r
 {\r
-       cptr p;\r
+       concptr p;\r
 \r
        /* Start at the end */\r
        p = s + strlen(s) - 1;\r
@@ -888,7 +888,7 @@ static char *analyze_font(char *path, int *wp, int *hp)
 /*\r
  * Check for existance of a file\r
  */\r
-static bool check_file(cptr s)\r
+static bool check_file(concptr s)\r
 {\r
        char path[1024];\r
 \r
@@ -937,7 +937,7 @@ static bool check_file(cptr s)
 /*\r
  * Check for existance of a directory\r
  */\r
-static bool check_dir(cptr s)\r
+static bool check_dir(concptr s)\r
 {\r
        int i;\r
 \r
@@ -994,7 +994,7 @@ static bool check_dir(cptr s)
 /*\r
  * Validate a file\r
  */\r
-static void validate_file(cptr s)\r
+static void validate_file(concptr s)\r
 {\r
        /* Verify or fail */\r
        if (!check_file(s))\r
@@ -1007,7 +1007,7 @@ static void validate_file(cptr s)
 /*\r
  * Validate a directory\r
  */\r
-static void validate_dir(cptr s, bool vital)\r
+static void validate_dir(concptr s, bool vital)\r
 {\r
        /* Verify or fail */\r
        if (!check_dir(s))\r
@@ -1663,7 +1663,7 @@ static bool init_graphics(void)
        /* Initialize once */\r
        char buf[1024];\r
        BYTE wid, hgt, twid, thgt, ox, oy;\r
-       cptr name;\r
+       concptr name;\r
 \r
        if (arg_graphics == GRAPHICS_ADAM_BOLT)\r
        {\r
@@ -1846,7 +1846,7 @@ static void term_window_resize(term_data *td)
  *\r
  * Note that the "font name" must be capitalized!!!\r
  */\r
-static errr term_force_font(term_data *td, cptr path)\r
+static errr term_force_font(term_data *td, concptr path)\r
 {\r
        int wid, hgt;\r
 \r
@@ -2796,7 +2796,7 @@ static errr Term_wipe_win(int x, int y, int n)
  * what color it should be using to draw with, but perhaps simply changing\r
  * it every time is not too inefficient.  \r
  */\r
-static errr Term_text_win(int x, int y, int n, TERM_COLOR a, cptr s)\r
+static errr Term_text_win(int x, int y, int n, TERM_COLOR a, concptr s)\r
 {\r
        term_data *td = (term_data*)(Term->data);\r
        RECT rc;\r
@@ -2989,7 +2989,7 @@ static errr Term_text_win(int x, int y, int n, TERM_COLOR a, cptr s)
  *\r
  * If "graphics" is not available, we simply "wipe" the given grids.\r
  */\r
-static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp)\r
+static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, concptr cp, const TERM_COLOR *tap, concptr tcp)\r
 {\r
        term_data *td = (term_data*)(Term->data);\r
 \r
@@ -5280,7 +5280,7 @@ LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg,
 /*\r
  * Display warning message (see "z-util.c")\r
  */\r
-static void hack_plog(cptr str)\r
+static void hack_plog(concptr str)\r
 {\r
        /* Give a warning */\r
        if (str)\r
@@ -5300,7 +5300,7 @@ static void hack_plog(cptr str)
 /*\r
  * Display error message and quit (see "z-util.c")\r
  */\r
-static void hack_quit(cptr str)\r
+static void hack_quit(concptr str)\r
 {\r
        /* Give a warning */\r
        if (str)\r
@@ -5333,7 +5333,7 @@ static void hack_quit(cptr str)
 /*\r
  * Display warning message (see "z-util.c")\r
  */\r
-static void hook_plog(cptr str)\r
+static void hook_plog(concptr str)\r
 {\r
        /* Warning */\r
        if (str)\r
@@ -5353,7 +5353,7 @@ static void hook_plog(cptr str)
 /*\r
  * Display error message and quit (see "z-util.c")\r
  */\r
-static void hook_quit(cptr str)\r
+static void hook_quit(concptr str)\r
 {\r
        int i;\r
 \r