[ogs-changes] dist/c++/ogs/creatures/humanoids Human.cpp,1.1,1.2 Human.h,1.2,1.3

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

Update of /cvsroot/ogs/dist/c++/ogs/creatures/humanoids
In directory sc8-pr-cvs1:/tmp/cvs-serv8841/humanoids

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


Index: Human.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/creatures/humanoids/Human.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Human.cpp	29 Mar 2003 02:10:35 -0000	1.1
--- Human.cpp	13 Apr 2003 05:25:21 -0000	1.2
***************
*** 21,30 ****
   */
  
  #include "ogs/core/Die.h"
  #include "ogs/creatures/humanoids/Human.h"
  
  using ogs::core::Die;
  using ogs::creatures::humanoids::Human;
  
! Die Human::_maximumAge (Die::d20, 2);
  
--- 21,45 ----
   */
  
+ #include "ogs/core/Ability.h"
+ #include "ogs/core/Abilities.h"
  #include "ogs/core/Die.h"
  #include "ogs/creatures/humanoids/Human.h"
  
+ using ogs::core::Abilities;
  using ogs::core::Die;
  using ogs::creatures::humanoids::Human;
  
! const Die Human::_maximumAge (Die::d20, 2);
! 
! /**
!  * Create a set of abilities for this type of creature.  This method
!  * creates a complete et of abilities using the average method.
!  *
!  * @return A set of abilities for this type of creature.
!  */
! Abilities Human::createAbilities () {
!   using ogs::core::Ability;
!   Ability::AverageMethod averageMethod;
!   return (Abilities (averageMethod));
! }
  

Index: Human.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/creatures/humanoids/Human.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Human.h	29 Mar 2003 02:10:35 -0000	1.2
--- Human.h	13 Apr 2003 05:25:21 -0000	1.3
***************
*** 47,51 ****
               public ogs::core::details::Maturity {
    public:
- 
      Human ();
  
--- 47,50 ----
***************
*** 56,68 ****
      const ogs::core::Die& getMaximumAge () const;
  
!   private:
!     static ogs::core::Die _maximumAge;
  
  };
  
  /**
!  * Create a new human creature.
   */
! inline Human::Human () {
    // empty constructor body
  }
--- 55,70 ----
      const ogs::core::Die& getMaximumAge () const;
  
!   protected:
!     static ogs::core::Abilities createAbilities ();
  
+   private:
+     static const ogs::core::Die _maximumAge;
  };
  
  /**
!  * Create a new human.
   */
! inline Human::Human ():
!   Humanoid (ogs::core::Die (HIT_DIE, 1), createAbilities ()) {
    // empty constructor body
  }
***************
*** 74,78 ****
   * @return 15 years
   */
! inline unsigned Human::getAdultAge () const {
    return (15);
  }
--- 76,81 ----
   * @return 15 years
   */
! inline unsigned
! Human::getAdultAge () const {
    return (15);
  }
***************
*** 84,88 ****
   * @return 35 years
   */
! inline unsigned Human::getMiddleAge () const {
    return (35);
  }
--- 87,92 ----
   * @return 35 years
   */
! inline unsigned
! Human::getMiddleAge () const {
    return (35);
  }
***************
*** 94,98 ****
   * @return 53 years
   */
! inline unsigned Human::getOldAge () const {
    return (53);
  }
--- 98,103 ----
   * @return 53 years
   */
! inline unsigned
! Human::getOldAge () const {
    return (53);
  }
***************
*** 104,108 ****
   * @return 70 years
   */
! inline unsigned Human::getVenerableAge () const {
    return (70);
  }
--- 109,114 ----
   * @return 70 years
   */
! inline unsigned
! Human::getVenerableAge () const {
    return (70);
  }
***************
*** 114,119 ****
   * @return 2d20
   */
! inline const ogs::core::Die& Human::getMaximumAge () const {
!   return (_maximumAge);
  }
  
--- 120,126 ----
   * @return 2d20
   */
! inline const ogs::core::Die&
! Human::getMaximumAge () const {
!   return (this->_maximumAge);
  }