rnd-19981204-2

diff --git a/src/Makefile b/src/Makefile
index 3019442b927bbc46e2e13e3a669c1a060af26fa0..3735291679c09be9eb9a0e84331b1bf06ec0b814 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -70,6 +70,7 @@ CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK)     \
 
 # DEBUG = -DDEBUG -g -Wall -ansi -pedantic
 # DEBUG = -DDEBUG -g -Wall
+# DEBUG = -O3 -Wall -ansi -pedantic
 DEBUG = -O3 -Wall
 # DEBUG = -O3
 

diff --git a/src/files.c b/src/files.c
index 211a38d1f295572b094e2bbb094f6702b19514a0..ba39f3f3018cc5db14f7a6da0eb00db75bb3497a 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -443,6 +443,17 @@ void LoadTape(int level_nr)
   int file_version = FILE_VERSION_1_2; /* last version of tape files */
   int chunk_length;
 
+  /* always start with reliable default values (empty tape) */
+  TapeErase();
+
+  /* default values (also for pre-1.2 tapes) with only the first player */
+  tape.player_participates[0] = TRUE;
+  for(i=1; i<MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
+
+  /* at least one (default: the first) player participates in every tape */
+  num_participating_players = 1;
+
   if (!(file = fopen(filename, "r")))
     return;
 
@@ -491,7 +502,7 @@ void LoadTape(int level_nr)
     for(i=0; i<TAPE_HEADER_UNUSED; i++)                /* skip unused header bytes */
       fgetc(file);
 
-    /* check which players participate in this tape recording */
+    /* since version 1.2, tapes store which players participate in the tape */
     num_participating_players = 0;
     for(i=0; i<MAX_PLAYERS; i++)
     {
@@ -538,10 +549,6 @@ void LoadTape(int level_nr)
     {
       tape.pos[i].action[j] = MV_NO_MOVING;
 
-      /* pre-1.2 tapes store data for only one player */
-      if (file_version == FILE_VERSION_1_0 && j > 0)
-       continue;
-
       if (tape.player_participates[j])
        tape.pos[i].action[j] = fgetc(file);
     }

diff --git a/src/init.c b/src/init.c
index 321875dc2aba3f1a5b042f160a56aee319b2fddf..bc72b99a2787ca8f660bfafabbb38ca8baf9b712 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -172,8 +172,9 @@ void InitSound()
   for(i=0; i<NUM_SOUNDS; i++)
   {
 #ifdef MSDOS
-  sprintf(sound_name[i], "%d", i+1);
+    sprintf(sound_name[i], "%d", i + 1);
 #endif
+
     Sound[i].name = sound_name[i];
     if (!LoadSound(&Sound[i]))
     {
@@ -188,10 +189,7 @@ void InitSoundServer()
   if (sound_status == SOUND_OFF)
     return;
 
-#ifdef MSDOS
-  SoundServer();
-  return;
-#endif
+#ifndef MSDOS
 
   if (pipe(sound_pipe)<0)
   {
@@ -216,6 +214,12 @@ void InitSoundServer()
   }
   else                         /* we are parent */
     close(sound_pipe[0]);      /* no reading from pipe needed */
+
+#else /* MSDOS */
+
+  SoundServer();
+
+#endif /* MSDOS */
 }
 
 void InitJoysticks()

diff --git a/src/msdos.c b/src/msdos.c
index ebc8319542c1863c22541662323d99327590b71f..05948fd9f8ccca1e0373abe93201a92f44604768 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -52,9 +52,11 @@ static int global_colormap_entries_used = 0;
 
 boolean wait_for_vsync;
 
+/*
 extern int playing_sounds;
 extern struct SoundControl playlist[MAX_SOUNDS_PLAYING];
 extern struct SoundControl emptySoundControl;
+*/
 
 static BITMAP *Read_PCX_to_AllegroBitmap(char *);
 
@@ -86,7 +88,7 @@ static void allegro_drivers()
   joystick_event = FALSE;
 
   reserve_voices(MAX_SOUNDS_PLAYING, 0);
-  if (install_sound(DIGI_AUTODETECT, MIDI_NONE, "ROCKS.SND") == -1)
+  if (install_sound(DIGI_AUTODETECT, MIDI_NONE, NULL) == -1)
     if (install_sound(DIGI_SB, MIDI_NONE, NULL) == -1)
       sound_status = SOUND_OFF;
 }
@@ -762,57 +764,6 @@ KeySym XLookupKeysym(XKeyEvent *key_event, int index)
   return key_event->state;
 }
 
-void sound_handler(struct SoundControl snd_ctrl)
-{
-  int i;
-
-  if (snd_ctrl.fade_sound)
-  {
-    if (!playing_sounds)
-      return;
-
-    for (i=0; i<MAX_SOUNDS_PLAYING; i++)
-      if ((snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr) &&
-         !playlist[i].fade_sound)
-      {
-       playlist[i].fade_sound = TRUE;
-       if (voice_check(playlist[i].voice))
-         voice_ramp_volume(playlist[i].voice, 1000, 0);
-       playlist[i].loop = PSND_NO_LOOP;
-      }
-  }
-  else if (snd_ctrl.stop_all_sounds)
-  {
-    if (!playing_sounds)
-      return;
-    SoundServer_StopAllSounds();
-  }
-  else if (snd_ctrl.stop_sound)
-  {
-    if (!playing_sounds)
-      return;
-    SoundServer_StopSound(snd_ctrl.nr);
-  }
-
-  for (i=0; i<MAX_SOUNDS_PLAYING; i++)
-  {
-    if (!playlist[i].active || playlist[i].loop)
-      continue;
-
-    playlist[i].playingpos = voice_get_position(playlist[i].voice);
-    playlist[i].volume = voice_get_volume(playlist[i].voice);
-    if (playlist[i].playingpos == -1 || !playlist[i].volume)
-    {
-      deallocate_voice(playlist[i].voice);
-      playlist[i] = emptySoundControl;
-      playing_sounds--;
-    }
-  }
-
-  if (snd_ctrl.active)
-    SoundServer_InsertNewSound(snd_ctrl);
-}
-
 void NetworkServer(int port, int serveronly)
 {
   Error(ERR_WARN, "networking not supported in DOS version");

diff --git a/src/sound.c b/src/sound.c
index 2518499b3e9feb21fbd7fe1fd23a969079b877d1..340ec942b8ebc30d25e62107bdf02a28e30498c5 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -14,31 +14,41 @@
 #include "sound.h"
 #include "misc.h"
 
-#ifdef MSDOS
-extern void sound_handler(struct SoundControl);
-#endif
-
 /*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
 
-#ifndef MSDOS
+static int playing_sounds = 0;
 static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
 static struct SoundControl emptySoundControl =
 {
   -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
 };
+
+#ifndef MSDOS
 static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
 static char premix_first_buffer[SND_BLOCKSIZE];
 #ifdef VOXWARE
 static char premix_left_buffer[SND_BLOCKSIZE];
 static char premix_right_buffer[SND_BLOCKSIZE];
 static int premix_last_buffer[SND_BLOCKSIZE];
-#endif
+#endif /* VOXWARE */
 static unsigned char playing_buffer[SND_BLOCKSIZE];
-static int playing_sounds = 0;
-#else
-struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-struct SoundControl emptySoundControl;
-int playing_sounds;
+#endif /* MSDOS */
+
+/* forward declaration of internal functions */
+#ifdef VOXWARE
+static void SoundServer_InsertNewSound(struct SoundControl);
+#endif
+#ifndef VOXWARE
+static unsigned char linear_to_ulaw(int);
+static int ulaw_to_linear(unsigned char);
+#endif
+#ifdef HPUX_AUDIO
+static void HPUX_Audio_Control();
+#endif
+#ifdef MSDOS
+static void SoundServer_InsertNewSound(struct SoundControl);
+static void SoundServer_StopSound(int);
+static void SoundServer_StopAllSounds();
 #endif
 
 void SoundServer()
@@ -68,7 +78,7 @@ void SoundServer()
   FD_ZERO(&sound_fdset); 
   FD_SET(sound_pipe[0], &sound_fdset);
 
-  for(;;)      /* wait for calls from PlaySound(), StopSound(), ... */
+  while(1)     /* wait for sound playing commands from client */
   {
     FD_SET(sound_pipe[0], &sound_fdset);
     select(sound_pipe[0]+1, &sound_fdset, NULL, NULL, NULL);
@@ -120,8 +130,8 @@ void SoundServer()
       struct timeval delay = { 0, 0 };
       byte *sample_ptr;
       long sample_size;
-      long max_sample_size; /* MIGHT BE USED UNINITIALIZED!  TO BE FIXED! */
-      long fragment_size;
+      static long max_sample_size = 0;
+      static long fragment_size = 0;
       boolean stereo;
 
       if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
@@ -309,14 +319,67 @@ void SoundServer()
 #endif /* !VOXWARE */
 
   }
-#endif
+#endif /* !MSDOS */
 }
 
-void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+#ifdef MSDOS
+static void sound_handler(struct SoundControl snd_ctrl)
 {
-  int i,k;
+  int i;
+
+  if (snd_ctrl.fade_sound)
+  {
+    if (!playing_sounds)
+      return;
 
-  /* wenn voll, ältesten Sound 'rauswerfen */
+    for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+      if ((snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr) &&
+         !playlist[i].fade_sound)
+      {
+       playlist[i].fade_sound = TRUE;
+       if (voice_check(playlist[i].voice))
+         voice_ramp_volume(playlist[i].voice, 1000, 0);
+       playlist[i].loop = PSND_NO_LOOP;
+      }
+  }
+  else if (snd_ctrl.stop_all_sounds)
+  {
+    if (!playing_sounds)
+      return;
+    SoundServer_StopAllSounds();
+  }
+  else if (snd_ctrl.stop_sound)
+  {
+    if (!playing_sounds)
+      return;
+    SoundServer_StopSound(snd_ctrl.nr);
+  }
+
+  for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+  {
+    if (!playlist[i].active || playlist[i].loop)
+      continue;
+
+    playlist[i].playingpos = voice_get_position(playlist[i].voice);
+    playlist[i].volume = voice_get_volume(playlist[i].voice);
+    if (playlist[i].playingpos == -1 || !playlist[i].volume)
+    {
+      deallocate_voice(playlist[i].voice);
+      playlist[i] = emptySoundControl;
+      playing_sounds--;
+    }
+  }
+
+  if (snd_ctrl.active)
+    SoundServer_InsertNewSound(snd_ctrl);
+}
+#endif /* MSDOS */
+
+static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+{
+  int i, k;
+
+  /* if playlist is full, remove oldest sound */
   if (playing_sounds==MAX_SOUNDS_PLAYING)
   {
     int longest=0, longest_nr=0;
@@ -343,14 +406,14 @@ void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     playing_sounds--;
   }
 
-  /* nachsehen, ob (und ggf. wie oft) Sound bereits gespielt wird */
+  /* check if sound is already being played (and how often) */
   for(k=0,i=0;i<MAX_SOUNDS_PLAYING;i++)
   {
     if (playlist[i].nr == snd_ctrl.nr)
       k++;
   }
 
-  /* falls Sound-Loop: nur neu beginnen, wenn Sound gerade ausklingt */
+  /* restart loop sounds only if they are just fading out */
   if (k>=1 && snd_ctrl.loop)
   {
     for(i=0;i<MAX_SOUNDS_PLAYING;i++)
@@ -369,12 +432,12 @@ void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     return;
   }
 
-  /* keinen Sound mehr als n mal gleichzeitig spielen (momentan n==2) */
+  /* don't play sound more than n times simultaneously (with n == 2 for now) */
   if (k>=2)
   {
     int longest=0, longest_nr=0;
 
-    /* den bereits am längsten gespielten (gleichen) Sound suchen */
+    /* look for oldest equal sound */
     for(i=0;i<MAX_SOUNDS_PLAYING;i++)
     {
       int actual;
@@ -435,7 +498,7 @@ void SoundServer_FadeSound(int nr)
 }
 */
 
-void SoundServer_StopSound(int nr)
+static void SoundServer_StopSound(int nr)
 {
   int i;
 
@@ -459,7 +522,7 @@ void SoundServer_StopSound(int nr)
 #endif
 }
 
-void SoundServer_StopAllSounds()
+static void SoundServer_StopAllSounds()
 {
   int i;
 
@@ -479,7 +542,7 @@ void SoundServer_StopAllSounds()
 }
 
 #ifdef HPUX_AUDIO
-void HPUX_Audio_Control()
+static void HPUX_Audio_Control()
 {
   struct audio_describe ainfo;
   int audio_ctl;
@@ -528,7 +591,7 @@ void HPUX_Audio_Control()
 #define BIAS 0x84   /* define the add-in bias for 16 bit samples */
 #define CLIP 32635
 
-unsigned char linear_to_ulaw(int sample)
+static unsigned char linear_to_ulaw(int sample)
 {
   static int exp_lut[256] =
   {
@@ -589,7 +652,7 @@ unsigned char linear_to_ulaw(int sample)
 ** Output: signed 16 bit linear sample
 */
 
-int ulaw_to_linear(unsigned char ulawbyte)
+static int ulaw_to_linear(unsigned char ulawbyte)
 {
   static int exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
   int sign, exponent, mantissa, sample;
@@ -629,11 +692,11 @@ static unsigned long le2long(unsigned long *be)   /* little-endian -> longword */
 
 boolean LoadSound(struct SoundInfo *snd_info)
 {
-  FILE *file;
   char filename[256];
   char *sound_ext = "wav";
 #ifndef MSDOS
   struct SoundHeader_WAV *sound_header;
+  FILE *file;
   int i;
 #endif
 
@@ -641,6 +704,7 @@ boolean LoadSound(struct SoundInfo *snd_info)
          options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
 
 #ifndef MSDOS
+
   if ((file = fopen(filename, "r")) == NULL)
   {
     Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
@@ -694,9 +758,9 @@ boolean LoadSound(struct SoundInfo *snd_info)
   if (!snd_info->sample_ptr)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
     return(FALSE);
   }
+
 #endif /* MSDOS */
 
   return(TRUE);
@@ -704,10 +768,10 @@ boolean LoadSound(struct SoundInfo *snd_info)
 
 boolean LoadSound_8SVX(struct SoundInfo *snd_info)
 {
-  FILE *file;
   char filename[256];
 #ifndef MSDOS
   struct SoundHeader_8SVX *sound_header;
+  FILE *file;
   char *ptr;
   char *sound_ext = "8svx";
 #else
@@ -800,7 +864,6 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
   if(!snd_info->sample_ptr)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
     return(FALSE);
   }
   return(TRUE);

diff --git a/src/sound.h b/src/sound.h
index 2c747bd859788cd3d16f13ac5d3b759e5a1dc3e8..ca97ff0a39f735a7cccb6ce700b8ee949cb20f71 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -159,16 +159,10 @@ struct SoundControl
 #endif
 };
 
-/* sound server functions */
+/* start sound server */
 void SoundServer(void);
-void SoundServer_InsertNewSound(struct SoundControl);
-void SoundServer_StopSound(int);
-void SoundServer_StopAllSounds(void);
-void HPUX_Audio_Control(void);
-unsigned char linear_to_ulaw(int);
-int ulaw_to_linear(unsigned char);
-
-/* application functions */
+
+/* client functions */
 boolean LoadSound(struct SoundInfo *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);