OSDN Git Service

(root) / hengband / hengband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
荒野の4隅のmimicが実際の行き先の地形と異なるバグを修正. 4隅でも正式な
[hengband/hengband.git] / src / main-win.c
diff --git a/src/main-win.c b/src/main-win.c
index e6c82cd..3bc0f1c 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -404,7 +404,7 @@ struct _term_data
        uint map_tile_hgt;
 
        bool map_active;
-#ifdef JP
+#if 1 /* #ifdef JP */
        LOGFONT lf;
 #endif
 
@@ -500,15 +500,11 @@ static bool can_use_graphics = FALSE;
  */
 static DIBINIT infGraph;
 
-#ifdef USE_TRANSPARENCY
-
 /*
  * The global bitmap mask
  */
 static DIBINIT infMask;
 
-#endif /* USE_TRANSPARENCY */
-
 #endif /* USE_GRAPHICS */
 
 
@@ -550,7 +546,7 @@ static cptr AngList = "AngList";
 static cptr ANGBAND_DIR_XTRA_GRAF;
 static cptr ANGBAND_DIR_XTRA_SOUND;
 static cptr ANGBAND_DIR_XTRA_HELP;
-#ifndef JP
+#if 0 /* #ifndef JP */
 static cptr ANGBAND_DIR_XTRA_FONT;
 #endif
 #ifdef USE_MUSIC
@@ -738,7 +734,11 @@ static int init_bg(void)
 
        hBG = LoadImage(NULL, bmfile,  IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
        if (!hBG) {
+#ifdef JP
                plog_fmt("ÊÉ»æÍѥӥåȥޥåנ'%s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£", bmfile);
+#else
+               plog_fmt("Can't load the bitmap file '%s'.", bmfile);
+#endif
                use_bg = 0;
                return 0;
        }
@@ -825,7 +825,7 @@ static cptr extract_file_name(cptr s)
  *
  * Return a pointer to a static buffer holding the capitalized base name.
  */
-#ifndef JP
+#if 0 /* #ifndef JP */
 static char *analyze_font(char *path, int *wp, int *hp)
 {
        int wid, hgt;
@@ -849,7 +849,7 @@ static char *analyze_font(char *path, int *wp, int *hp)
        }
 
        /* Find first 'X' */
-       s = strchr(p, 'X');
+       s = my_strchr(p, 'X');
 
        /* Extract font width */
        wid = atoi(p);
@@ -1084,12 +1084,16 @@ static void save_prefs_aux(term_data *td, cptr sec_name)
 #ifdef JP
        strcpy(buf, td->lf.lfFaceName[0]!='\0' ? td->lf.lfFaceName : "£Í£Ó ¥´¥·¥Ã¥¯");
 #else
+#if 0
        strcpy(buf, td->font_file ? td->font_file : "8X13.FON");
+#else
+       strcpy(buf, td->lf.lfFaceName[0]!='\0' ? td->lf.lfFaceName : "Courier");
+#endif
 #endif
 
        WritePrivateProfileString(sec_name, "Font", buf, ini_file);
 
-#ifdef JP
+#if 1 /* #ifdef JP */
        wsprintf(buf, "%d", td->lf.lfWidth);
        WritePrivateProfileString(sec_name, "FontWid", buf, ini_file);
        wsprintf(buf, "%d", td->lf.lfHeight);
@@ -1191,7 +1195,11 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
 #ifdef JP
        GetPrivateProfileString(sec_name, "Font", "£Í£Ó ¥´¥·¥Ã¥¯", tmp, 127, ini_file);
 #else
+#if 0
        GetPrivateProfileString(sec_name, "Font", "8X13.FON", tmp, 127, ini_file);
+#else
+       GetPrivateProfileString(sec_name, "Font", "Courier", tmp, 127, ini_file);
+#endif
 #endif
 
 
@@ -1199,7 +1207,7 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
        td->bizarre = (GetPrivateProfileInt(sec_name, "Bizarre", td->bizarre, ini_file) != 0);
 
        /* Analyze font, save desired font name */
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->font_want = string_make(tmp);
        hgt = 15; wid = 0;
        td->lf.lfWidth  = GetPrivateProfileInt(sec_name, "FontWid", wid, ini_file);
@@ -1211,7 +1219,7 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
 
 
        /* Tile size */
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->tile_wid = GetPrivateProfileInt(sec_name, "TileWid", td->lf.lfWidth, ini_file);
        td->tile_hgt = GetPrivateProfileInt(sec_name, "TileHgt", td->lf.lfHeight, ini_file);
 #else
@@ -1552,8 +1560,6 @@ static bool init_graphics(void)
                infGraph.CellWidth = wid;
                infGraph.CellHeight = hgt;
 
-#ifdef USE_TRANSPARENCY
-
                if (arg_graphics == GRAPHICS_ADAM_BOLT)
                {
                        /* Access the mask file */
@@ -1567,8 +1573,6 @@ static bool init_graphics(void)
                        }
                }
 
-#endif /* USE_TRANSPARENCY */
-
                /* Activate a palette */
                if (!new_palette())
                {
@@ -1647,7 +1651,7 @@ static errr term_force_font(term_data *td, cptr path)
 {
        int wid, hgt;
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        int i;
        char *base;
        char buf[1024];
@@ -1656,7 +1660,7 @@ static errr term_force_font(term_data *td, cptr path)
        /* Forget the old font (if needed) */
        if (td->font_id) DeleteObject(td->font_id);
 
-#ifdef JP
+#if 1 /* #ifdef JP */
        /* Unused */
        (void)path;
 
@@ -1761,7 +1765,7 @@ static errr term_force_font(term_data *td, cptr path)
  */
 static void term_change_font(term_data *td)
 {
-#ifdef JP
+#if 1 /* #ifdef JP */
        CHOOSEFONT cf;
 
        memset(&cf, 0, sizeof(cf));
@@ -2445,8 +2449,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
        RECT rc;
        HDC hdc;
 
-
-#ifdef JP
+#if 1 /* #ifdef JP */
        static HBITMAP  WALL;
        static HBRUSH   myBrush, oldBrush;
        static HPEN     oldPen;
@@ -2568,6 +2571,30 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                                rc.right += td->tile_wid;
                        }
 #else
+#if 1
+                       if (*(s+i)==127){
+                               oldBrush = SelectObject(hdc, myBrush);
+                               oldPen = SelectObject(hdc, GetStockObject(NULL_PEN) );
+
+                               /* Dump the wall */
+                               Rectangle(hdc, rc.left, rc.top, rc.right+1, rc.bottom+1);
+
+                               SelectObject(hdc, oldBrush);
+                               SelectObject(hdc, oldPen);
+
+                               /* Advance */
+                               rc.left += td->tile_wid;
+                               rc.right += td->tile_wid;
+                       } else {
+                               /* Dump the text */
+                               ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc,
+                                      s+i, 1, NULL);
+
+                               /* Advance */
+                               rc.left += td->tile_wid;
+                               rc.right += td->tile_wid;
+                       }
+#else
                        /* Dump the text */
                        ExtTextOut(hdc, rc.left, rc.top, 0, &rc,
                                   s+i, 1, NULL);
@@ -2576,6 +2603,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                        rc.left += td->tile_wid;
                        rc.right += td->tile_wid;
 #endif
+#endif
 
                }
        }
@@ -2609,11 +2637,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
  *
  * If "graphics" is not available, we simply "wipe" the given grids.
  */
-# ifdef USE_TRANSPARENCY
 static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp)
-# else /* USE_TRANSPARENCY */
-static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
-# endif /* USE_TRANSPARENCY */
 {
        term_data *td = (term_data*)(Term->data);
 
@@ -2622,15 +2646,10 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        int i;
        int x1, y1, w1, h1;
        int x2, y2, w2, h2, tw2;
-
-# ifdef USE_TRANSPARENCY
-
        int x3, y3;
 
        HDC hdcMask;
 
-# endif /* USE_TRANSPARENCY */
-
        HDC hdc;
        HDC hdcSrc;
        HBITMAP hbmSrcOld;
@@ -2673,16 +2692,12 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        hdcSrc = CreateCompatibleDC(hdc);
        hbmSrcOld = SelectObject(hdcSrc, infGraph.hBitmap);
 
-# ifdef USE_TRANSPARENCY
-
        if (arg_graphics == GRAPHICS_ADAM_BOLT)
        {
                hdcMask = CreateCompatibleDC(hdc);
                SelectObject(hdcMask, infMask.hBitmap);
        }
 
-# endif /* USE_TRANSPARENCY */
-
        /* Draw attr/char pairs */
        for (i = 0; i < n; i++, x2 += w2)
        {
@@ -2697,8 +2712,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                x1 = col * w1;
                y1 = row * h1;
 
-# ifdef USE_TRANSPARENCY
-
                if (arg_graphics == GRAPHICS_ADAM_BOLT)
                {
                        x3 = (tcp[i] & 0x7F) * w1;
@@ -2738,9 +2751,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                        }
                }
                else
-
-# endif /* USE_TRANSPARENCY */
-
                {
                        /* Perfect size */
                        if ((w1 == tw2) && (h1 == h2))
@@ -2765,8 +2775,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        SelectObject(hdcSrc, hbmSrcOld);
        DeleteDC(hdcSrc);
 
-# ifdef USE_TRANSPARENCY
-
        if (arg_graphics == GRAPHICS_ADAM_BOLT)
        {
                /* Release */
@@ -2774,8 +2782,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                DeleteDC(hdcMask);
        }
 
-# endif /* USE_TRANSPARENCY */
-
        /* Release */
        ReleaseDC(td->w, hdc);
 
@@ -2798,9 +2804,7 @@ static void windows_map(void)
        int x, min_x, max_x;
        int y, min_y, max_y;
 
-#ifdef USE_TRANSPARENCY
        byte ta, tc;
-#endif
 
        /* Only in graphics mode */
        if (!use_graphics) return;
@@ -2824,20 +2828,12 @@ static void windows_map(void)
        {
                for (y = min_y; y < max_y; y++)
                {
-#ifdef USE_TRANSPARENCY
                        map_info(y, x, &a, (char*)&c, &ta, (char*)&tc);
-#else /* USE_TRANSPARENCY */
-                       map_info(y, x, &a, (char*)&c);
-#endif /* USE_TRANSPARENCY */
 
                        /* Ignore non-graphics */
                        if ((a & 0x80) && (c & 0x80))
                        {
-#ifdef USE_TRANSPARENCY
                                Term_pict_win(x - min_x, y - min_y, 1, &a, &c, &ta, &tc);
-#else /* USE_TRANSPARENCY */
-                               Term_pict_win(x - min_x, y - min_y, 1, &a, &c);
-#endif /* USE_TRANSPARENCY */
                        }
                }
        }
@@ -2916,7 +2912,7 @@ static void init_windows(void)
 
        term_data *td;
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        char buf[1024];
 #endif
 
@@ -2940,8 +2936,7 @@ static void init_windows(void)
        td->pos_x = 7 * 30;
        td->pos_y = 7 * 20;
        td->posfix = FALSE;
-
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->bizarre = TRUE;
 #endif
        /* Sub windows */
@@ -2961,7 +2956,7 @@ static void init_windows(void)
                td->pos_x = (7 - i) * 30;
                td->pos_y = (7 - i) * 20;
                td->posfix = FALSE;
-#ifdef JP
+#if 1 /* #ifdef JP */
                        td->bizarre = TRUE;
 #endif
        }
@@ -2993,9 +2988,13 @@ static void init_windows(void)
        {
                td = &data[i];
 
-#ifdef JP
+#if 1 /* #ifdef JP */
                strncpy(td->lf.lfFaceName, td->font_want, LF_FACESIZE);
+#ifdef JP
                td->lf.lfCharSet = SHIFTJIS_CHARSET;
+#else
+               td->lf.lfCharSet = ANSI_CHARSET;
+#endif
                td->lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
                /* Activate the chosen font */
                term_force_font(td, NULL);
@@ -4325,13 +4324,49 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
 #else /* ZANGBAND */
                                /* do_cmd_save_game(); */
 #endif /* ZANGBAND */
-                               Term_key_push(252);
+                               Term_key_push(SPECIAL_KEY_QUIT);
                                return 0;
                        }
                        quit(NULL);
                        return 0;
                }
 
+               case WM_QUERYENDSESSION:
+               {
+                       if (game_in_progress && character_generated)
+                       {
+                               /* Hack -- Forget messages */
+                               msg_flag = FALSE;
+
+                               /* Mega-Hack -- Delay death */
+                               if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
+
+#ifdef JP
+                               do_cmd_write_nikki(NIKKI_GAMESTART, 0, "----¥²¡¼¥àÃæÃÇ----");
+#else
+                               do_cmd_write_nikki(NIKKI_GAMESTART, 0, "---- Save and Exit Game ----");
+#endif
+
+                               /* Hardcode panic save */
+                               p_ptr->panic_save = 1;
+
+                               /* Forbid suspend */
+                               signals_ignore_tstp();
+
+                               /* Indicate panic save */
+#ifdef JP
+                               (void)strcpy(p_ptr->died_from, "(¶ÛµÞ¥»¡¼¥Ö)");
+#else
+                               (void)strcpy(p_ptr->died_from, "(panic save)");
+#endif
+
+                               /* Panic save */
+                               (void)save_player();
+                       }
+                       quit(NULL);
+                       return 0;
+               }
+
                case WM_QUIT:
                {
                        quit(NULL);
@@ -4875,10 +4910,8 @@ static void hook_quit(cptr str)
        if (infGraph.hPalette) DeleteObject(infGraph.hPalette);
        if (infGraph.hBitmap) DeleteObject(infGraph.hBitmap);
 
-#ifdef USE_TRANSPARENCY
        if (infMask.hPalette) DeleteObject(infMask.hPalette);
        if (infMask.hBitmap) DeleteObject(infMask.hBitmap);
-#endif /* USE_TRANSPARENCY */
 
 #endif /* USE_GRAPHICS */
 
@@ -4983,7 +5016,7 @@ static void init_stuff(void)
        validate_file(path);
 
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        /* Build the "font" path */
        path_build(path, sizeof(path), ANGBAND_DIR_XTRA, "font");
 
@@ -5179,6 +5212,8 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
                }
        }
 
+       /* Catch nasty signals */
+       signals_init();
 
        /* Initialize */
        init_angband();
変愚蛮怒のメインリポジトリです
About OSDN
Find Software
Develop Software
Help