Changeset 275

Timestamp:

07/04/07 18:01:45 (1 year ago)

Author:

takkaria

Message:

Fix Windows sound support (closes #165).

Files:

• trunk/src/main-win.c (modified) (9 diffs)
• trunk/src/win/angband.rc (modified) (1 diff)

trunk/src/main-win.c

@@ -180 +180 @@
-#define IDM_OPTIONS_GRAPHICS_DAVID  403
-#define IDM_OPTIONS_BIGTILE         409
-#define IDM_OPTIONS_SOUND           410
-#define IDM_OPTIONS_LOW_PRIORITY    420
-#define IDM_OPTIONS_SAVER           430
@@ -956 +955 @@
-        WritePrivateProfileString("Angband", "Bigtile", buf, ini_file);
-
-        /* Save the "arg_sound" flag */
-        strcpy(buf, arg_sound ? "1" : "0");
-        WritePrivateProfileString("Angband", "Sound", buf, ini_file);
-
-        /* Save window prefs */
@@ -1024 +1020 @@
-        /* Extract the "use_bigtile" flag */
-        use_bigtile = GetPrivateProfileInt("Angband", "Bigtile", FALSE, ini_file);
-
-        /* Extract the "arg_sound" flag */
-        arg_sound = (GetPrivateProfileInt("Angband", "Sound", 0, ini_file) != 0);
-
-        /* Extract the "arg_fiddle" flag */
@@ -1766 +1759 @@
-        {
-                /* Initialize (if needed) */
-arg
+use
-                {
-                        /* Warning */
@@ -1772 +1765 @@
-
-                        /* Cannot enable */
-arg
+use
-                }
-
-                /* Change setting */
-use_sound = arg
+arg_sound = use
-        }
-
@@ -2901 +2894 @@
-        EnableMenuItem(hm, IDM_OPTIONS_BIGTILE,
-                       MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-        EnableMenuItem(hm, IDM_OPTIONS_SOUND,
-                       MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-        EnableMenuItem(hm, IDM_OPTIONS_SAVER,
-                       MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
@@ -2927 +2918 @@
-        CheckMenuItem(hm, IDM_OPTIONS_BIGTILE,
-                      (use_bigtile ? MF_CHECKED : MF_UNCHECKED));
-
-
+
-#ifdef USE_SAVER
-        CheckMenuItem(hm, IDM_OPTIONS_SAVER,
@@ -2948 +2938 @@
-        }
-#endif /* USE_GRAPHICS */
-
-#ifdef USE_SOUND
-        if (inkey_flag && initialized)
-        {
-                /* Menu "Options", Item "Sound" */
-                EnableMenuItem(hm, IDM_OPTIONS_SOUND, MF_ENABLED);
-        }
-#endif /* USE_SOUND */
-
-#ifdef USE_SAVER
@@ -3582 +3564 @@
-                }
-
-                case IDM_OPTIONS_SOUND:
-                {
-                        /* Paranoia */
-                        if (!inkey_flag || !initialized)
-                        {
-                                plog("You may not do that right now.");
-                                break;
-                        }
-
-                        /* Toggle "arg_sound" */
-                        arg_sound = !arg_sound;
-
-                        /* React to changes */
-                        Term_xtra_win_react();
-
-                        /* Hack -- Force redraw */
-                        Term_key_push(KTRL('R'));
-
-                        break;
-                }
-
-#ifdef USE_SAVER
-

trunk/src/win/angband.rc

@@ -113 +113 @@
-                }
-
-                MENUITEM "&Sound", 410
-                MENUITEM SEPARATOR
-                MENUITEM "Low Priority", 420