Turn on compiler optimisation and warning options

Add SDL_mixer sound code

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 39

1 files changed, 6 insertions, 18 deletions

diff --git a/src/s_sound.c b/src/s_sound.c
index 1d3b18ec..0692db9b 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: s_sound.c 37 2005-08-04 18:42:15Z fraggle $
+// $Id: s_sound.c 39 2005-08-04 21:48:32Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.4  2005/08/04 21:48:32  fraggle
+// Turn on compiler optimisation and warning options
+// Add SDL_mixer sound code
+//
 // Revision 1.3  2005/08/04 18:42:15  fraggle
 // Silence compiler warnings
 //
@@ -38,7 +42,7 @@
 
 
 static const char
-rcsid[] = "$Id: s_sound.c 37 2005-08-04 18:42:15Z fraggle $";
+rcsid[] = "$Id: s_sound.c 39 2005-08-04 21:48:32Z fraggle $";
 
 
 
@@ -380,22 +384,6 @@ S_StartSoundAtVolume
   if (sfx->lumpnum < 0)
     sfx->lumpnum = I_GetSfxLumpNum(sfx);
 
-#ifndef SNDSRV
-  // cache data if necessary
-  if (!sfx->data)
-  {
-    fprintf( stderr,
-	     "S_StartSoundAtVolume: 16bit and not pre-cached - wtf?\n");
-
-    // DOS remains, 8bit handling
-    //sfx->data = (void *) W_CacheLumpNum(sfx->lumpnum, PU_MUSIC);
-    // fprintf( stderr,
-    //	     "S_StartSoundAtVolume: loading %d (lump %d) : 0x%x\n",
-    //       sfx_id, sfx->lumpnum, (int)sfx->data );
-    
-  }
-#endif
-  
   // increase the usefulness
   if (sfx->usefulness++ < 0)
     sfx->usefulness = 1;