[Epfl-cvs] tgengine-0.1 soundmanager.cc,1.21,1.22

[Seb <whi...@us...>]

Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26366

Modified Files:
	soundmanager.cc 
Log Message:
Desactivation complete du soundmanager avec -nosound dans la console
En attendant de corriger le bug sous Linux.


Index: soundmanager.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/soundmanager.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** soundmanager.cc	23 Nov 2004 08:03:28 -0000	1.21
--- soundmanager.cc	25 Nov 2004 18:21:43 -0000	1.22
***************
*** 137,141 ****
  	
  	alListenerfv(AL_ORIENTATION, ListenerOr);
- 
  }
  
--- 137,140 ----
***************
*** 147,152 ****
  	#endif
  
! 	pSoundManager->SetListenerPosition(ListenerCam->GetPosition());
! 	pSoundManager->SetListenerOrientation(ListenerCam->GetForward(),ListenerCam->GetUp());
  }
  
--- 146,154 ----
  	#endif
  
! 	if(enable)
! 	{
! 		pSoundManager->SetListenerPosition(ListenerCam->GetPosition());
! 		pSoundManager->SetListenerOrientation(ListenerCam->GetForward(),ListenerCam->GetUp());
! 	}
  }
  
***************
*** 590,596 ****
  bool SoundManager::CheckSound(string name)
  {
! 	if(SoundList[name] && SoundNodeList[name])
  	{
! 		if(enable)
  		{
  			return AL_TRUE;
--- 592,598 ----
  bool SoundManager::CheckSound(string name)
  {
! 	if(enable)
  	{
! 		if(SoundList[name] && SoundNodeList[name])
  		{
  			return AL_TRUE;
***************
*** 598,601 ****
--- 600,606 ----
  		else
  		{
+ 			#ifdef SOUND_DEBUG
+ 			cerr << "[OpenAL] Sound " << name << " not loaded..." << endl;
+ 			#endif
  			return AL_FALSE;
  		}
***************
*** 603,609 ****
  	else
  	{
- 		#ifdef SOUND_DEBUG
- 		cerr << "[OpenAL] Sound " << name << " not loaded..." << endl;
- 		#endif
  		return AL_FALSE;
  	}
--- 608,611 ----