[Planeshift-cvs] CVS: planeshift/src/client/sound pssoundmngr.cpp,1.107,1.108 pssoundmngr.h,1.54,1.55

[DaveG <da...@us...>]

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

Modified Files:
	pssoundmngr.cpp pssoundmngr.h 
Log Message:
Fixing name conflict to allow for new notify function...

Index: pssoundmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** pssoundmngr.cpp	24 Nov 2005 23:36:21 -0000	1.107
--- pssoundmngr.cpp	25 Nov 2005 07:44:47 -0000	1.108
***************
*** 1559,1563 ****
      {
          psSoundObject* obj = weatherNotify[i];
!         obj->Notify(SOUND_EVENT_WEATHER);
      }
  }
--- 1559,1563 ----
      {
          psSoundObject* obj = weatherNotify[i];
!         obj->EventNotify(SOUND_EVENT_WEATHER);
      }
  }
***************
*** 1689,1693 ****
  }
  
! void psSoundObject::Notify(int event)
  {
      if(event != connectedWith)
--- 1689,1693 ----
  }
  
! void psSoundObject::EventNotify(int event)
  {
      if(event != connectedWith)

Index: pssoundmngr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** pssoundmngr.h	1 Nov 2005 16:53:02 -0000	1.54
--- pssoundmngr.h	25 Nov 2005 07:44:47 -0000	1.55
***************
*** 423,427 ****
      csStringBase& GetName() { return resourceName; }
  
!     void Notify(int event);
      
  protected:        
--- 423,427 ----
      csStringBase& GetName() { return resourceName; }
  
!     void EventNotify(int event);
      
  protected: