[Planeshift-cvs] CVS: planeshift/src/client/sound pssoundmngr.cpp,1.102,1.103 pssoundmngr.h,1.53,1.54

[stfrn <st...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26196/src/client/sound

Modified Files:
	pssoundmngr.cpp pssoundmngr.h 
Log Message:
Also needed for the background music loop.

Index: pssoundmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** pssoundmngr.cpp	26 Oct 2005 04:33:39 -0000	1.102
--- pssoundmngr.cpp	1 Nov 2005 16:53:02 -0000	1.103
***************
*** 504,507 ****
--- 504,516 ----
          guiEnabled = false;
  }
+ 
+ void psSoundManager::ToggleLoop(bool toggle)
+ {
+     if(toggle)
+         loopBGM = true;
+     else
+         loopBGM = false;
+ }
+ 
  bool psSoundManager::HandleEvent( iEvent& event )
  {
***************
*** 1024,1028 ****
                                                              timeOfDay, 
                                                              timeOfDayRange,
!                                                             weather, false);   
                      obj->SetResource( resource );
                      manager->NewBackground( obj );
--- 1033,1038 ----
                                                              timeOfDay, 
                                                              timeOfDayRange,
!                                                             weather,
!                                                             sndmngr->LoopBGM());   
                      obj->SetResource( resource );
                      manager->NewBackground( obj );

Index: pssoundmngr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** pssoundmngr.h	26 Oct 2005 04:33:39 -0000	1.53
--- pssoundmngr.h	1 Nov 2005 16:53:02 -0000	1.54
***************
*** 137,140 ****
--- 137,141 ----
      virtual void ToggleActions(bool toggle);
      virtual void ToggleGUI(bool toggle);
+     virtual void ToggleLoop(bool toggle);
      
      virtual bool PlayingMusic() {return musicEnabled;}
***************
*** 142,146 ****
      virtual bool PlayingActions() {return actionsEnabled;}
      virtual bool PlayingGUI() {return guiEnabled;}
!     
      /** Update the sound system with the new time of day */
      virtual void ChangeTimeOfDay( int newTime );
--- 143,148 ----
      virtual bool PlayingActions() {return actionsEnabled;}
      virtual bool PlayingGUI() {return guiEnabled;}
!     virtual bool LoopBGM() {return loopBGM;}
! 
      /** Update the sound system with the new time of day */
      virtual void ChangeTimeOfDay( int newTime );
***************
*** 209,212 ****
--- 211,215 ----
      bool actionsEnabled;
      bool guiEnabled;
+     bool loopBGM;
  
      float musicVolume;