* <p>\r
* The "Term_xtra_win_clear()" function should probably do a low-level\r
* clear of the current window, and redraw the borders and other things,\r
-* if only for efficiency. XXX XXX XXX\r
+* if only for efficiency. \r
* </p>\r
*\r
* <p>\r
* A simpler method is needed for selecting the "tile size" for windows.\r
-* XXX XXX XXX\r
* </p>\r
*\r
* <p>\r
* window, I think, and only a few calls actually check for its existance,\r
* this may be okay since "NULL" means "on top of all windows". (?) The\r
* user must never be allowed to "hide" the main window, or the "menubar"\r
-* will disappear. XXX XXX XXX\r
+* will disappear. \r
* </p>\r
*\r
* <p>\r
* Special "Windows Help Files" can be placed into "lib/xtra/help/" for\r
* use with the "winhelp.exe" program. These files *may* be available\r
-* at the ftp site somewhere, but I have not seen them. XXX XXX XXX\r
+* at the ftp site somewhere, but I have not seen them. \r
* </p>\r
*\r
* <p>\r
#endif\r
\r
/*\r
- * Hack -- Fake declarations from "dos.h" XXX XXX XXX\r
+ * Hack -- Fake declarations from "dos.h" \r
*/\r
#ifdef WIN32\r
#define INVALID_FILE_NAME (DWORD)0xFFFFFFFF\r
#else /* WIN32 */\r
#define FA_LABEL 0x08 /* Volume label */\r
#define FA_DIREC 0x10 /* Directory */\r
-unsigned _cdecl _dos_getfileattr(const char *, unsigned *);\r
+unsigned _cdecl _dos_getfileattr(concptr , unsigned *);\r
#endif /* WIN32 */\r
\r
/*\r
struct _term_data\r
{\r
term t;\r
- cptr s;\r
+ concptr s;\r
HWND w;\r
DWORD dwStyle;\r
DWORD dwExStyle;\r
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
\r
};\r
\r
-#define MAX_TERM_DATA 8 //!< Maximum number of windows XXX XXX XXX\r
+#define MAX_TERM_DATA 8 //!< Maximum number of windows \r
\r
static term_data data[MAX_TERM_DATA]; //!< An array of term_data's\r
static term_data *my_td; //!< Hack -- global "window creation" pointer\r
/*\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
#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
/*\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
use_bg = 0;\r
return 0;\r
}\r
-#if 0 /* gomi */\r
- HDC wnddc, dcimage, dcbg;\r
- HBITMAP bmimage, bmimage_old, bmbg_old;\r
- int i, j;\r
-\r
- delete_bg();\r
-\r
- wnddc = GetDC(hwnd);\r
- dcimage = CreateCompatibleDC(wnddc);\r
- dcbg = CreateCompatibleDC(wnddc);\r
-\r
- bmimage = LoadImage(NULL, "bg.bmp", LR_LOADFROMFILE, 0, 0, 0);\r
- if (!bmimage) quit("bg.bmpが読みこめない！");\r
- bmimage_old = SelectObject(dcimage, bmimage);\r
-\r
- CreateCompatibleBitmap();\r
-\r
- ReleaseDC(hwnd, wnddc);\r
-#endif\r
use_bg = 1;\r
return 1;\r
}\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
/* Save results */\r
(*wp) = wid;\r
(*hp) = hgt;\r
-\r
- /* Result */\r
return (p);\r
}\r
#endif\r
/*\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
/*\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
/*\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
/*\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
rc.top = 0;\r
rc.bottom = rc.top + hgt;\r
\r
- /* XXX XXX XXX */\r
/* rc.right += 1; */\r
/* rc.bottom += 1; */\r
\r
static void save_prefs_aux(int i)\r
{\r
term_data *td = &data[i];\r
- char sec_name[128];\r
+ GAME_TEXT sec_name[128];\r
char buf[1024];\r
\r
RECT rc;\r
static void load_prefs_aux(int i)\r
{\r
term_data *td = &data[i];\r
- char sec_name[128];\r
+ GAME_TEXT sec_name[128];\r
char tmp[1024];\r
\r
int wid, hgt, posx, posy;\r
#if defined(USE_SOUND) || defined(USE_MUSIC)\r
\r
/*\r
- * XXX XXX XXX - Taken from files.c.\r
+ * - Taken from files.c.\r
*\r
* Extract "tokens" from a buffer\r
*\r
/* 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
/* Activate a palette */\r
if (!new_palette())\r
{\r
- /* Free bitmap XXX XXX XXX */\r
+ /* Free bitmap */\r
\r
- /* Oops */\r
plog(_("パレットを実現できません！", "Cannot activate palette!"));\r
return (FALSE);\r
}\r
\r
/* Graphics available */\r
current_graphics_mode = arg_graphics;\r
-\r
- /* Result */\r
return (current_graphics_mode);\r
}\r
#endif /* USE_GRAPHICS */\r
/* Sound available */\r
can_use_music = TRUE;\r
}\r
-\r
- /* Result */\r
return (can_use_music);\r
}\r
\r
/* Sound available */\r
can_use_sound = TRUE;\r
}\r
-\r
- /* Result */\r
return (can_use_sound);\r
}\r
#endif /* USE_SOUND */\r
*\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
\r
/* Redraw the contents */\r
Term_redraw();\r
-\r
- /* Restore */\r
Term_activate(old);\r
}\r
}\r
/*\r
* Hack -- clear the screen\r
*\r
- * Make this more efficient XXX XXX XXX\r
+ * Make this more efficient \r
*/\r
static errr Term_xtra_win_clear(void)\r
{\r
\r
#else /* USE_SOUND */\r
\r
- /* Oops */\r
return (1);\r
\r
#endif /* USE_SOUND */\r
}\r
}\r
\r
- /* Oops */\r
return 1;\r
}\r
\r
*\r
* One would think there is a more efficient method for telling a window\r
* what color it should be using to draw with, but perhaps simply changing\r
- * it every time is not too inefficient. XXX XXX XXX\r
+ * it every time is not too inefficient. \r
*/\r
-static errr Term_text_win(int x, int y, int n, byte a, const char *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
*\r
* If "graphics" is not available, we simply "wipe" the given grids.\r
*/\r
-static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *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
#ifdef USE_GRAPHICS\r
\r
int i;\r
- int x1, y1, w1, h1, tw1, th1;\r
- int x2, y2, w2, h2, tw2 = 0;\r
- int x3, y3;\r
+ TERM_LEN x1, y1, w1, h1, tw1, th1;\r
+ TERM_LEN x2, y2, w2, h2, tw2 = 0;\r
+ TERM_LEN x3, y3;\r
\r
HDC hdcMask = NULL;\r
\r
/* Draw attr/char pairs */\r
for (i = 0; i < n; i++, x2 += w2)\r
{\r
- byte a = ap[i];\r
+ TERM_COLOR a = ap[i];\r
char c = cp[i];\r
\r
\r
static void windows_map(void)\r
{\r
term_data *td = &data[0];\r
- byte a;\r
+ TERM_COLOR a;\r
char c;\r
- int x, min_x, max_x;\r
- int y, min_y, max_y;\r
+ TERM_LEN x, min_x, max_x;\r
+ TERM_LEN y, min_y, max_y;\r
\r
- byte ta;\r
+ TERM_COLOR ta;\r
char tc;\r
\r
/* Only in graphics mode */\r
if (!use_graphics) return;\r
-\r
- /* Clear screen */\r
Term_xtra_win_clear();\r
\r
td->map_tile_wid = (td->tile_wid * td->cols) / MAX_WID;\r
* to over-ride selected values, then create the windows, and fonts.\r
*\r
* Must use SW_SHOW not SW_SHOWNA, since on 256 color display\r
- * must make active to realize the palette. XXX XXX XXX\r
+ * must make active to realize the palette. \r
*/\r
static void init_windows(void)\r
{\r
/* Force the use of that font */\r
(void)term_force_font(td, buf);\r
\r
- /* Oops */\r
td->tile_wid = 8;\r
td->tile_hgt = 13;\r
\r
SetWindowPos(td->w, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);\r
\r
\r
- /* New palette XXX XXX XXX */\r
+ /* New palette */\r
(void)new_palette();\r
\r
\r
}\r
else\r
{\r
- /* Save Screen */\r
screen_save();\r
-\r
- /* Clear screen */\r
Term_clear();\r
\r
/* Display the scores */\r
\r
/* Forget the high score fd */\r
highscore_fd = -1;\r
-\r
- /* Load screen */\r
screen_load();\r
\r
/* Hack - Flush it */\r
\r
if (hwndSaver)\r
{\r
- /* Push the window to the bottom XXX XXX XXX */\r
+ /* Push the window to the bottom */\r
SetWindowPos(hwndSaver, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);\r
}\r
else\r
}\r
else\r
{\r
-#ifdef JP\r
- plog_fmt("ヘルプファイル[%s]が見付かりません。", tmp);\r
- plog("代わりにオンラインヘルプを使用してください。");\r
-#else\r
- plog_fmt("Cannot find help file: %s", tmp);\r
- plog("Use the online help files instead.");\r
-#endif\r
-\r
+ plog_fmt(_("ヘルプファイル[%s]が見付かりません。", "Cannot find help file: %s"), tmp);\r
+ plog(_("代わりにオンラインヘルプを使用してください。", "Use the online help files instead."));\r
}\r
break;\r
#else /* HTML_HELP */\r
}\r
else\r
{\r
-#ifdef JP\r
- plog_fmt("ヘルプファイル[%s]が見付かりません。", tmp);\r
- plog("代わりにオンラインヘルプを使用してください。");\r
-#else\r
- plog_fmt("Cannot find help file: %s", tmp);\r
- plog("Use the online help files instead.");\r
-#endif\r
+ plog_fmt(_("ヘルプファイル[%s]が見付かりません。", "Cannot find help file: %s"), tmp);\r
+ plog(_("代わりにオンラインヘルプを使用してください。", "Use the online help files instead."));\r
\r
}\r
break;\r
LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,\r
WPARAM wParam, LPARAM lParam)\r
#else /* __MWERKS__ */\r
-LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,\r
- WPARAM wParam, LPARAM lParam)\r
+LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)\r
#endif /* __MWERKS__ */\r
{\r
PAINTSTRUCT ps;\r
/* Handle message */\r
switch (uMsg)\r
{\r
- /* XXX XXX XXX */\r
case WM_NCCREATE:\r
{\r
SetWindowLong(hWnd, 0, (LONG)(my_td));\r
break;\r
}\r
\r
- /* XXX XXX XXX */\r
case WM_CREATE:\r
{\r
#ifdef USE_MUSIC\r
\r
case SIZE_MAXIMIZED:\r
{\r
- /* fall through XXX XXX XXX */\r
+ /* fall through */\r
}\r
\r
case SIZE_RESTORED:\r
/* Process message */\r
switch (uMsg)\r
{\r
- /* XXX XXX XXX */\r
case WM_NCCREATE:\r
{\r
SetWindowLong(hWnd, 0, (LONG)(my_td));\r
break;\r
}\r
\r
- /* XXX XXX XXX */\r
case WM_CREATE:\r
{\r
return 0;\r
\r
/* HACK - Redraw all windows */\r
p_ptr->window = 0xFFFFFFFF;\r
- window_stuff();\r
+ handle_stuff();\r
}\r
\r
td->size_hack = FALSE;\r
/* Process */\r
switch (uMsg)\r
{\r
- /* XXX XXX XXX */\r
case WM_NCCREATE:\r
{\r
break;\r
}\r
}\r
\r
- /* Oops */\r
return DefWindowProc(hWnd, uMsg, wParam, lParam);\r
}\r
\r
/*\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
/*\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
/*\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
/*\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
save_prefs();\r
\r
\r
- /*** Could use 'Term_nuke_win()' XXX XXX XXX */\r
+ /*** Could use 'Term_nuke_win()' */\r
\r
/* Destroy all windows */\r
for (i = MAX_TERM_DATA - 1; i >= 0; --i)\r
/* Get program name with full path */\r
GetModuleFileName(hInstance, path, 512);\r
\r
- /* Save the "program name" XXX XXX XXX */\r
+ /* Save the "program name" */\r
argv0 = path;\r
\r
/* Get the name of the "*.ini" file */\r
HDC hdc;\r
MSG msg;\r
\r
- setlocale( LC_ALL, "ja_JP" );\r
+ setlocale(LC_ALL, "ja_JP.utf8");\r
\r
/* Unused */\r
(void)nCmdShow;\r
return FALSE;\r
}\r
\r
- /* Initialize */\r
if (hPrevInst == NULL)\r
{\r
wc.style = CS_CLASSDC;\r
/* Catch nasty signals */\r
signals_init();\r
\r
- /* Initialize */\r
Term_activate(term_screen);\r
init_angband();\r
\r
OSDN Git Service
