Move os_beep() call to beginning of z_sound_effect(). In curses it calls beep().

diff --git a/src/common/sound.c b/src/common/sound.c
index b1cbf4c247a313bbb1a1d74b49d2aca417de9ad6..9c0bc7d5514ee7fdb7929d10a7f4c213e1c93d2e 100644 (file)
--- a/src/common/sound.c
+++ b/src/common/sound.c
@@ -158,6 +158,11 @@ void z_sound_effect (void)
     if (zargc < 3)
        volume = 8;
 
+    if (number == 1 || number == 2) {
+       os_beep(number);
+       return;
+    }
+
     if (!f_setup.sound_flag) {
         runtime_error(ERR_PLAY_SOUND);
         return;
@@ -206,6 +211,6 @@ void z_sound_effect (void)
 
        locked = FALSE;
 
-    } else os_beep (number);
+    }
 
 }/* z_sound_effect */

diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index 2896f161affdb3234a49ba47ec39a077197a98ff..95640a35bd9caf9344a366e323cd67b8e44bc6f3 100644 (file)
--- a/src/curses/ux_audio.c
+++ b/src/curses/ux_audio.c
@@ -874,10 +874,11 @@ os_start_sample(int number, int volume, int repeats, zword eos)
 void os_beep(int bv)
 {
     (void) bv;
-    /*Currently not implemented*/
+    /*Currently implemented as a simple terminal bell*/
     /*To implement generate a high frequency beep for bv=1,*/
     /*low frequency for bv=2*/
     /*fprintf(audio_log, "os_beep(%d)...\n", bv);*/
+    beep();
 }
 void os_prepare_sample(int id)
 {