[Planeshift-cvs] CVS: planeshift/src/common/effects pseffectmanager.cpp,1.9,1.10 pseffectmanager.h,1.9,1.10

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/effects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24403/src/common/effects

Modified Files:
	pseffectmanager.cpp pseffectmanager.h 
Log Message:
Fixes for latest CrystalSpace so you will need to update/rebuild CS 

Index: pseffectmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectmanager.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pseffectmanager.cpp	20 Jan 2005 12:07:38 -0000	1.9
--- pseffectmanager.cpp	29 Apr 2005 00:11:37 -0000	1.10
***************
*** 54,58 ****
  {
  #ifndef DONT_DO_EFFECTS
!     csHash<psEffect *, csStrKey, csConstCharHashKeyHandler>::GlobalIterator it = effectFactories.GetIterator();
      while (it.HasNext())
      {
--- 54,58 ----
  {
  #ifndef DONT_DO_EFFECTS
!     csHash<psEffect *, csStrKey>::GlobalIterator it = effectFactories.GetIterator();
      while (it.HasNext())
      {
***************
*** 328,332 ****
  }
  
! csHash<psEffect *, csStrKey, csConstCharHashKeyHandler>::GlobalIterator psEffectManager::GetEffectsIterator()
  {
      return effectFactories.GetIterator();
--- 328,332 ----
  }
  
! csHash<psEffect *, csStrKey>::GlobalIterator psEffectManager::GetEffectsIterator()
  {
      return effectFactories.GetIterator();

Index: pseffectmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectmanager.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pseffectmanager.h	18 Dec 2004 03:14:07 -0000	1.9
--- pseffectmanager.h	29 Apr 2005 00:11:37 -0000	1.10
***************
*** 29,33 ****
  #include <iutil/virtclk.h>
  #include <csutil/hash.h>
- #include <csutil/hashhandlers.h>
  
  struct iSector;
--- 29,32 ----
***************
*** 137,141 ****
       *   @return the iterator.
       */
!     csHash<psEffect *, csStrKey, csConstCharHashKeyHandler>::GlobalIterator GetEffectsIterator();
      
  private:
--- 136,140 ----
       *   @return the iterator.
       */
!     csHash<psEffect *, csStrKey>::GlobalIterator GetEffectsIterator();
      
  private:
***************
*** 148,152 ****
       * new effect is needed.
       */
!     csHash<psEffect *, csStrKey, csConstCharHashKeyHandler> effectFactories;
  
      /// the actual effects that are seen
--- 147,151 ----
       * new effect is needed.
       */
!     csHash<psEffect *, csStrKey> effectFactories;
  
      /// the actual effects that are seen