[Planeshift-cvs] CVS: planeshift/src/client/sound pssoundmngr.cpp,1.127,1.128

[Arianna B. <ar...@us...>]

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

Modified Files:
	pssoundmngr.cpp 
Log Message:
Fix for combats/spells music

Index: pssoundmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** pssoundmngr.cpp	22 Jan 2006 16:11:29 -0000	1.127
--- pssoundmngr.cpp	22 Jan 2006 22:32:02 -0000	1.128
***************
*** 1455,1459 ****
              if (dir == FADE_UP)
                  mapsoundsystem->RegisterActiveSong(ambient[z]);
!             ambient[z]->StartFade( dir );
          }        
      
--- 1455,1460 ----
              if (dir == FADE_UP)
                  mapsoundsystem->RegisterActiveSong(ambient[z]);
!             if(ambient[z]->MatchWeather(weather))
!                 ambient[z]->StartFade( dir );
          }