[ogs-changes] dist/c++/ogs/magic Ability.cpp,1.4,1.5 ExperienceCost.h,1.2,1.3 LevelRange.cpp,1.2,1.3 LevelRange.h,1.2,1.3

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

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

Modified Files:
	Ability.cpp ExperienceCost.h LevelRange.cpp LevelRange.h 
Log Message:
See C++ ChangeLog (Apr 13) for details.


Index: Ability.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/Ability.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Ability.cpp	8 Apr 2003 21:43:10 -0000	1.4
--- Ability.cpp	13 Apr 2003 05:27:50 -0000	1.5
***************
*** 29,33 ****
   * Determine bonus spells for an ability score.
   *
!  * @param score An ability score.
   * @return Number of bonus spells per spell level.
   */
--- 29,33 ----
   * Determine bonus spells for an ability score.
   *
!  * @param modifier The value of an ability score modifier.
   * @return Number of bonus spells per spell level.
   */

Index: ExperienceCost.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/ExperienceCost.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExperienceCost.h	28 Feb 2003 11:11:25 -0000	1.2
--- ExperienceCost.h	13 Apr 2003 05:27:50 -0000	1.3
***************
*** 32,37 ****
  OGS_BEGIN_MAGIC_NAMESPACE
  
- using ogs::core::Experience;
- 
  /**
   * A spell component that costs experience points to cast.  A spell
--- 32,35 ----
***************
*** 41,51 ****
  class ExperienceCost: public Component {
    public:
!     ExperienceCost (Experience::Points xpCost);
!     Experience::Points getCost () const;
  
    private:
!     Experience::Points _xpCost;
  };
  
  /**
   * Create an experience cost component.
--- 39,52 ----
  class ExperienceCost: public Component {
    public:
!     ExperienceCost (XP::Points xpCost);
!     XP::Points getCost () const;
  
    private:
!     XP::Points _xpCost;
  };
  
+ /** A shorter name to use for experience cost. */
+ typedef ExperienceCost XPCost;
+ 
  /**
   * Create an experience cost component.
***************
*** 53,57 ****
   * @param xpCost Cost of casting spell in experience points.
   */
! inline ExperienceCost::ExperienceCost (Experience::Points xpCost):
    Component (Component::EXPERIENCE_COST) {
    this->_xpCost = xpCost;
--- 54,58 ----
   * @param xpCost Cost of casting spell in experience points.
   */
! inline ExperienceCost::ExperienceCost (XP::Points xpCost):
    Component (Component::EXPERIENCE_COST) {
    this->_xpCost = xpCost;
***************
*** 63,67 ****
   * @return Cost in experience points.
   */
! inline Experience::Points ExperienceCost::getCost () const {
    return (this->_xpCost);
  }
--- 64,68 ----
   * @return Cost in experience points.
   */
! inline XP::Points ExperienceCost::getCost () const {
    return (this->_xpCost);
  }

Index: LevelRange.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/LevelRange.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LevelRange.cpp	25 Mar 2003 06:13:13 -0000	1.2
--- LevelRange.cpp	13 Apr 2003 05:27:50 -0000	1.3
***************
*** 30,34 ****
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Close (Experience::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 25.0 + (5.0 * (casterLevel / 2));
--- 30,34 ----
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Close (XP::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 25.0 + (5.0 * (casterLevel / 2));
***************
*** 41,45 ****
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Medium (Experience::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 100.0 + (10.0 * casterLevel);
--- 41,45 ----
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Medium (XP::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 100.0 + (10.0 * casterLevel);
***************
*** 52,56 ****
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Long (Experience::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 400.0 + (40.0 * casterLevel);
--- 52,56 ----
   * @param casterLevel Level of spell caster.
   */
! LevelRange LevelRange::Long (XP::Level casterLevel) {
    // TODO: Change feet into locale dependent unit.
    float distance = 400.0 + (40.0 * casterLevel);
***************
*** 65,69 ****
   */
  LevelRange::LevelRange (Range::Type type, float distance,
!                         Experience::Level casterLevel):
    AbsoluteRange (type, distance) {
    this->casterLevel = casterLevel;
--- 65,69 ----
   */
  LevelRange::LevelRange (Range::Type type, float distance,
!                         XP::Level casterLevel):
    AbsoluteRange (type, distance) {
    this->casterLevel = casterLevel;

Index: LevelRange.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/LevelRange.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LevelRange.h	25 Feb 2003 19:40:24 -0000	1.2
--- LevelRange.h	13 Apr 2003 05:27:50 -0000	1.3
***************
*** 32,36 ****
  OGS_BEGIN_MAGIC_NAMESPACE
  
! using ogs::core::Experience;
  
  /**
--- 32,36 ----
  OGS_BEGIN_MAGIC_NAMESPACE
  
! using ogs::core::XP;
  
  /**
***************
*** 44,58 ****
  class LevelRange: public AbsoluteRange {
    public:
!     static LevelRange Close (Experience::Level casterLevel);
!     static LevelRange Medium (Experience::Level casterLevel);
!     static LevelRange Long (Experience::Level casterLevel);
  
!     Experience::Level getCasterLevel () const;
  
    private:
!     Experience::Level casterLevel;
  
      LevelRange (Range::Type type, float distance,
!                 Experience::Level casterLevel);
  };
  
--- 44,58 ----
  class LevelRange: public AbsoluteRange {
    public:
!     static LevelRange Close (XP::Level casterLevel);
!     static LevelRange Medium (XP::Level casterLevel);
!     static LevelRange Long (XP::Level casterLevel);
  
!     XP::Level getCasterLevel () const;
  
    private:
!     XP::Level casterLevel;
  
      LevelRange (Range::Type type, float distance,
!                 XP::Level casterLevel);
  };
  
***************
*** 62,66 ****
   * @return Caster level.
   */
! inline Experience::Level LevelRange::getCasterLevel () const {
    return (this->casterLevel);
  }
--- 62,66 ----
   * @return Caster level.
   */
! inline XP::Level LevelRange::getCasterLevel () const {
    return (this->casterLevel);
  }