koka氏のパッチを取り込み, Windowsでsound.cfgの設定が有効にならなかっ

たバグを修正.

diff --git a/src/main-win.c b/src/main-win.c
index 3f85edb..79bf704 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -519,10 +519,12 @@ static DIBINIT infMask;
  */
 static bool can_use_sound = FALSE;
 
+#define SAMPLE_MAX 8
+
 /*
  * An array of sound file names
  */
-static cptr sound_file[SOUND_MAX];
+static cptr sound_file[SOUND_MAX][SAMPLE_MAX];
 
 #endif /* USE_SOUND */
 
@@ -1252,6 +1254,88 @@ static void load_prefs(void)
        }
 }
 
+#ifdef USE_SOUND
+
+/*
+ * XXX XXX XXX - Taken from files.c.
+ *
+ * Extract "tokens" from a buffer
+ *
+ * This function uses "whitespace" as delimiters, and treats any amount of
+ * whitespace as a single delimiter.  We will never return any empty tokens.
+ * When given an empty buffer, or a buffer containing only "whitespace", we
+ * will return no tokens.  We will never extract more than "num" tokens.
+ *
+ * By running a token through the "text_to_ascii()" function, you can allow
+ * that token to include (encoded) whitespace, using "\s" to encode spaces.
+ *
+ * We save pointers to the tokens in "tokens", and return the number found.
+ */
+static s16b tokenize_whitespace(char *buf, s16b num, char **tokens)
+{
+       int k = 0;
+
+       char *s = buf;
+
+
+       /* Process */
+       while (k < num)
+       {
+               char *t;
+
+               /* Skip leading whitespace */
+               for ( ; *s && isspace(*s); ++s) /* loop */;
+
+               /* All done */
+               if (!*s) break;
+
+               /* Find next whitespace, if any */
+               for (t = s; *t && !isspace(*t); ++t) /* loop */;
+
+               /* Nuke and advance (if necessary) */
+               if (*t) *t++ = '\0';
+
+               /* Save the token */
+               tokens[k++] = s;
+
+               /* Advance */
+               s = t;
+       }
+
+       /* Count */
+       return (k);
+}
+
+static void load_sound_prefs(void)
+{
+       int i, j, num;
+       char tmp[1024];
+       char ini_path[1024];
+       char wav_path[1024];
+       char *zz[SAMPLE_MAX];
+
+       /* Access the sound.cfg */
+       path_build(ini_path, 1024, ANGBAND_DIR_XTRA_SOUND, "sound.cfg");
+
+       for (i = 0; i < SOUND_MAX; i++)
+       {
+               GetPrivateProfileString("Sound", angband_sound_name[i], "", tmp, 1024, ini_path);
+
+               num = tokenize_whitespace(tmp, SAMPLE_MAX, zz);
+
+               for (j = 0; j < num; j++)
+               {
+                       /* Access the sound */
+                       path_build(wav_path, 1024, ANGBAND_DIR_XTRA_SOUND, zz[j]);
+
+                       /* Save the sound filename, if it exists */
+                       if (check_file(wav_path))
+                               sound_file[i][j] = string_make(zz[j]);
+               }
+       }
+}
+
+#endif /* USE_SOUND */
 
 /*
  * Create the new global palette based on the bitmap palette
@@ -1506,23 +1590,8 @@ static bool init_sound(void)
        /* Initialize once */
        if (!can_use_sound)
        {
-               int i;
-
-               char wav[128];
-               char buf[1024];
-
-               /* Prepare the sounds */
-               for (i = 1; i < SOUND_MAX; i++)
-               {
-                       /* Extract name of sound file */
-                       sprintf(wav, "%s.wav", angband_sound_name[i]);
-
-                       /* Access the sound */
-                       path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_SOUND, wav);
-
-                       /* Save the sound filename, if it exists */
-                       if (check_file(buf)) sound_file[i] = string_make(buf);
-               }
+               /* Load the prefs */
+               load_sound_prefs();
 
                /* Sound available */
                can_use_sound = TRUE;
@@ -2081,6 +2150,11 @@ static errr Term_xtra_win_noise(void)
  */
 static errr Term_xtra_win_sound(int v)
 {
+#ifdef USE_SOUND
+       int i;
+       char buf[1024];
+#endif /* USE_SOUND */
+
        /* Sound disabled */
        if (!use_sound) return (1);
 
@@ -2089,18 +2163,28 @@ static errr Term_xtra_win_sound(int v)
 
 #ifdef USE_SOUND
 
-       /* Unknown sound */
-       if (!sound_file[v]) return (1);
+       /* Count the samples */
+       for (i = 0; i < SAMPLE_MAX; i++)
+       {
+               if (!sound_file[v][i])
+                       break;
+       }
+
+       /* No sample */
+       if (i == 0) return (1);
+
+       /* Build the path */
+       path_build(buf, 1024, ANGBAND_DIR_XTRA_SOUND, sound_file[v][Rand_simple(i)]);
 
 #ifdef WIN32
 
        /* Play the sound, catch errors */
-       return (PlaySound(sound_file[v], 0, SND_FILENAME | SND_ASYNC));
+       return (PlaySound(buf, 0, SND_FILENAME | SND_ASYNC));
 
 #else /* WIN32 */
 
        /* Play the sound, catch errors */
-       return (sndPlaySound(sound_file[v], SND_ASYNC));
+       return (sndPlaySound(buf, SND_ASYNC));
 
 #endif /* WIN32 */
 

diff --git a/src/z-rand.c b/src/z-rand.c
index 0678493..d1e82e6 100644 (file)
--- a/src/z-rand.c
+++ b/src/z-rand.c
@@ -342,4 +342,53 @@ s32b div_round(s32b n, s32b d)
 
 
 
+/*
+ * Extract a "random" number from 0 to m-1, using the "simple" RNG.
+ *
+ * This function should be used when generating random numbers in
+ * "external" program parts like the main-*.c files.  It preserves
+ * the current RNG state to prevent influences on game-play.
+ *
+ * Could also use rand() from <stdlib.h> directly. XXX XXX XXX
+ */
+u32b Rand_simple(u32b m)
+{
+       static bool initialized = FALSE;
+       static u32b simple_rand_value;
+       bool old_rand_quick;
+       u32b old_rand_value;
+       u32b result;
 
+
+       /* Save RNG state */
+       old_rand_quick = Rand_quick;
+       old_rand_value = Rand_value;
+
+       /* Use "simple" RNG */
+       Rand_quick = TRUE;
+
+       if (initialized)
+       {
+               /* Use stored seed */
+               Rand_value = simple_rand_value;
+       }
+       else
+       {
+               /* Initialize with new seed */
+               Rand_value = time(NULL);
+               initialized = TRUE;
+       }
+
+       /* Get a random number */
+       result = randint0(m);
+
+       /* Store the new seed */
+       simple_rand_value = Rand_value;
+
+       /* Restore RNG state */
+       Rand_quick = old_rand_quick;
+       Rand_value = old_rand_value;
+
+       /* Use the value */
+       return (result);
+}

diff --git a/src/z-rand.h b/src/z-rand.h
index bde2daa..84e0c69 100644 (file)
--- a/src/z-rand.h
+++ b/src/z-rand.h
@@ -97,6 +97,7 @@ extern s16b randnor(int mean, int stand);
 extern s16b damroll(int num, int sides);
 extern s16b maxroll(int num, int sides);
 extern s32b div_round(s32b n, s32b d);
+extern u32b Rand_simple(u32b m);
 
 
 #endif