[Gcblue-commits] gcb_wx/src/common tcSound.cpp,1.11,1.12

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv386/src/common

Modified Files:
	tcSound.cpp 
Log Message:


Index: tcSound.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcSound.cpp	20 Jan 2004 03:02:53 -0000	1.11
--- tcSound.cpp	13 Feb 2004 01:31:33 -0000	1.12
***************
*** 91,95 ****
      LoadWavDataFromFile("Beep2.wav",SEFFECT_BEEP2);
      LoadWavDataFromFile("RejectBeep.wav",SEFFECT_REJECTBEEP);
!     LoadWavDataFromFile("LightSaber.wav",SEFFECT_LIGHTSABER);
      LoadWavDataFromFile("Ping.wav",SEFFECT_PING);
      LoadWavDataFromFile("Ping2.wav",SEFFECT_PING2);
--- 91,95 ----
      LoadWavDataFromFile("Beep2.wav",SEFFECT_BEEP2);
      LoadWavDataFromFile("RejectBeep.wav",SEFFECT_REJECTBEEP);
!     LoadWavDataFromFile("Ping.wav",SEFFECT_LIGHTSABER);
      LoadWavDataFromFile("Ping.wav",SEFFECT_PING);
      LoadWavDataFromFile("Ping2.wav",SEFFECT_PING2);
***************
*** 150,153 ****
--- 150,158 ----
  
      alutLoadWAVFile((ALbyte*)zFilePath,&format,&wave,&size,&freq,&loop);
+     if (wave == NULL)
+     {
+         fprintf(stderr,"File not found, wav file %s\n",azFileName);
+         return false;
+     }
      if((err=alGetError())!=AL_NO_ERROR)
      {
***************
*** 158,161 ****
--- 163,172 ----
      alutUnloadWAV(format,wave,size,freq);
  
+     if((err=alGetError())!=AL_NO_ERROR)
+     {
+         fprintf(stderr,"Error buffering wav file %s\n",azFileName);
+         return false;
+     }
+ 
      return true;
  }