ｿｷ･ﾈ･鬣ﾃ･ﾗ｡｢ｷﾙﾊﾖ､ﾉｲﾃ｡｣

[hengband/hengband.git] / src / main-gcu.c

diff --git a/src/main-gcu.c b/src/main-gcu.c
index f1c8f9f..43f995d 100644 (file)
--- a/src/main-gcu.c
+++ b/src/main-gcu.c
@@ -861,14 +861,24 @@ static errr Term_xtra_gcu_event(int v)
  */
 static errr Term_xtra_gcu_sound(int v)
 {
-
    char buf[1024];
+
+   /* Sound disabled */
+   if (!use_sound) return (1);
+
+   /* Illegal sound */
+   if ((v < 0) || (v >= SOUND_MAX)) return (1);
+
+   /* Unknown sound */
+   if (!sound_file[v]) return (1);
+
    sprintf(buf,"./gcusound.sh %s\n", sound_file[v]);
    system(buf);
    
    return (0);
-#if 0
 
+#if 0
+   char *argv[4];
    pid_t pid;
 
    /* Sound disabled */
@@ -896,11 +906,10 @@ static errr Term_xtra_gcu_sound(int v)
       exit(0);
    }
 #endif
-
-#endif
    return (0);
 
 }
+#endif
 
 /*
  * React to changes