[ogs-changes] dist/c++/ogs/magic Spell.cpp,1.3,1.4 Spell.h,1.4,1.5

[<ele...@us...>]

Update of /cvsroot/ogs/dist/c++/ogs/magic
In directory sc8-pr-cvs1:/tmp/cvs-serv9450/c++/ogs/magic

Modified Files:
	Spell.cpp Spell.h 
Log Message:
See ChangeLog files (Apr 3-4) for details.


Index: Spell.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/Spell.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Spell.cpp	25 Mar 2003 06:13:13 -0000	1.3
--- Spell.cpp	4 Apr 2003 20:22:46 -0000	1.4
***************
*** 21,30 ****
   */
  
  #include "ogs/magic/Spell.h"
  
! using ogs::magic::Descriptors;
  using ogs::magic::Spell;
- 
- Descriptors Spell::_descriptors;
  
  /**
--- 21,29 ----
   */
  
+ #include "ogs/magic/MetamagicFeat.h"
  #include "ogs/magic/Spell.h"
  
! using ogs::magic::MetamagicFeat;
  using ogs::magic::Spell;
  
  /**

Index: Spell.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/Spell.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spell.h	29 Mar 2003 02:10:39 -0000	1.4
--- Spell.h	4 Apr 2003 20:22:47 -0000	1.5
***************
*** 32,36 ****
  #    include <ogs/magic/Component.h>
  #    include <ogs/magic/Descriptors.h>
- #    include <ogs/magic/MetamagicFeat.h>
  #    include <ogs/magic/Namespace.h>
  #    include <ogs/magic/Range.h>
--- 32,35 ----
***************
*** 39,42 ****
--- 38,43 ----
  OGS_BEGIN_MAGIC_NAMESPACE
  
+ class MetamagicFeat;
+ 
  /**
   * A magical effect produced by a caster.
***************
*** 82,88 ****
  
    private:
-     static Descriptors _descriptors;
- 
-     /** An array of metamagic feats. */
      typedef std::vector<MetamagicFeat*> MetamagicFeats;
      MetamagicFeats _metamagicFeats;
--- 83,86 ----
***************
*** 98,102 ****
   */
  inline Descriptors Spell::getDescriptors () const {
!   return (_descriptors);
  }
  
--- 96,101 ----
   */
  inline Descriptors Spell::getDescriptors () const {
!   Descriptors descriptors;
!   return (descriptors);
  }