Merge pull request #1192 from hengband/feature/3.0.0Alpha26

[hengbandforosx/hengbandosx.git] / src / main-win.cpp

diff --git a/src/main-win.cpp b/src/main-win.cpp
index 7f025ef..e2166c3 100644 (file)
--- a/src/main-win.cpp
+++ b/src/main-win.cpp
@@ -496,7 +496,7 @@ static void load_prefs_aux(int i)
 static void load_prefs(void)
 {
     arg_graphics = (byte)GetPrivateProfileIntA("Angband", "Graphics", static_cast<byte>(graphics_mode::GRAPHICS_NONE), ini_file);
-    arg_bigtile = (GetPrivateProfileIntA("Angband", "Bigtile", FALSE, ini_file) != 0);
+    arg_bigtile = (GetPrivateProfileIntA("Angband", "Bigtile", false, ini_file) != 0);
     use_bigtile = arg_bigtile;
     arg_sound = (GetPrivateProfileIntA("Angband", "Sound", 0, ini_file) != 0);
     arg_music = (GetPrivateProfileIntA("Angband", "Music", 0, ini_file) != 0);
@@ -1943,9 +1943,9 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam)
     if (GetKeyState(VK_MENU) & 0x8000)
         ma = true;
 
-    term_no_press = (ma) ? TRUE : false;
+    term_no_press = (ma) ? true : false;
     if (special_key[(byte)(wParam)] || (ma && !ignore_key[(byte)(wParam)])) {
-        bool ext_key = (lParam & 0x1000000L) ? TRUE : false;
+        bool ext_key = (lParam & 0x1000000L) ? true : false;
         bool numpad = false;
 
         term_keypress(31);
@@ -2374,7 +2374,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
         for (int i = 1; i < MAX_TERM_DATA; i++) {
             if (data[i].visible) {
-                if (wParam == TRUE) {
+                if (wParam == 1) {
                     ShowWindow(data[i].w, SW_SHOWNA);
                 } else {
                     ShowWindow(data[i].w, SW_HIDE);
@@ -2648,7 +2648,7 @@ int WINAPI WinMain(
     if (is_already_running()) {
         MessageBoxW(
             NULL, _(L"変愚蛮怒はすでに起動しています。", L"Hengband is already running."), _(L"エラー！", L"Error"), MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
-        return false;
+        return 0;
     }
 
     command_line.handle();
@@ -2717,13 +2717,13 @@ int WINAPI WinMain(
     term_flush();
     if (movie_in_progress) {
         // selected movie
-        play_game(p_ptr, FALSE, true);
+        play_game(p_ptr, false, true);
     } else if (savefile[0] == '\0') {
         // new game
-        play_game(p_ptr, TRUE, false);
+        play_game(p_ptr, true, false);
     } else {
         // selected savefile
-        play_game(p_ptr, FALSE, false);
+        play_game(p_ptr, false, false);
     }
 
     quit(NULL);