[ogs-changes] dist/c++/ogs/magic/abilities Charisma.h,1.2,1.3 Intelligence.h,1.2,1.3 Wisdom.h,1.2,1.
Status: Alpha
Brought to you by:
elemings
|
From: <ele...@us...> - 2003-04-18 01:41:09
|
Update of /cvsroot/ogs/dist/c++/ogs/magic/abilities
In directory sc8-pr-cvs1:/tmp/cvs-serv25962/c++/ogs/magic/abilities
Modified Files:
Charisma.h Intelligence.h Wisdom.h
Log Message:
See C++ ChangeLog (Apr 17) for details.
Index: Charisma.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/abilities/Charisma.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Charisma.h 8 Apr 2003 21:43:11 -0000 1.2
--- Charisma.h 18 Apr 2003 01:41:06 -0000 1.3
***************
*** 26,31 ****
# define OGS_MAGIC_ABILITIES_CHARISMA_H
! # include <ogs/core/abilities/Charisma.h>
# include <ogs/magic/Ability.h>
# include <ogs/magic/abilities/Namespace.h>
--- 26,32 ----
# define OGS_MAGIC_ABILITIES_CHARISMA_H
! # include <ogs/core/Ability.h>
# include <ogs/magic/Ability.h>
+ # include <ogs/magic/Types.h>
# include <ogs/magic/abilities/Namespace.h>
***************
*** 38,44 ****
* determining the highest spell level and bonus number of spells.
*/
! class Charisma: public ogs::core::abilities::Charisma,
public ogs::magic::Ability {
public:
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
--- 39,48 ----
* determining the highest spell level and bonus number of spells.
*/
! class Charisma: public ogs::core::Ability,
public ogs::magic::Ability {
public:
+ Charisma ();
+ Charisma (ogs::core::Ability::Method& method);
+
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
***************
*** 46,49 ****
--- 50,72 ----
/**
+ * Create a new Charisma score. The Charisma score is generated using
+ * the standard method.
+ */
+ inline Charisma::Charisma ():
+ ogs::core::Ability (ogs::core::Ability::CHA) {
+ // empty constructor body
+ }
+
+ /**
+ * Create a new Strength score using a method.
+ *
+ * @param method A method for generating ability scores.
+ */
+ inline Charisma::Charisma (ogs::core::Ability::Method& method):
+ ogs::core::Ability (ogs::core::Ability::STR, method) {
+ // empty constructor body
+ }
+
+ /**
* Determine highest spell level that can be cast. A negative value
* indicates that spells can not be cast based on this ability.
***************
*** 51,55 ****
* @return Highest spell level.
*/
! inline int Charisma::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
--- 74,79 ----
* @return Highest spell level.
*/
! inline int
! Charisma::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
***************
*** 60,64 ****
* @return Number of bonus spells per spell level.
*/
! inline Ability::SpellCounts Charisma::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
--- 84,89 ----
* @return Number of bonus spells per spell level.
*/
! inline SpellCounts
! Charisma::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
Index: Intelligence.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/abilities/Intelligence.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Intelligence.h 8 Apr 2003 21:43:12 -0000 1.2
--- Intelligence.h 18 Apr 2003 01:41:06 -0000 1.3
***************
*** 26,31 ****
# define OGS_MAGIC_ABILITIES_INTELLIGENCE_H
! # include <ogs/core/abilities/Intelligence.h>
# include <ogs/magic/Ability.h>
# include <ogs/magic/abilities/Namespace.h>
--- 26,32 ----
# define OGS_MAGIC_ABILITIES_INTELLIGENCE_H
! # include <ogs/core/Ability.h>
# include <ogs/magic/Ability.h>
+ # include <ogs/magic/Types.h>
# include <ogs/magic/abilities/Namespace.h>
***************
*** 38,44 ****
* determining the highest spell level and bonus number of spells.
*/
! class Intelligence: public ogs::core::abilities::Intelligence,
! public ogs::magic::Ability {
public:
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
--- 39,48 ----
* determining the highest spell level and bonus number of spells.
*/
! class Intelligence: public ogs::core::Ability,
! public ogs::magic::Ability {
public:
+ Intelligence ();
+ Intelligence (ogs::core::Ability::Method& method);
+
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
***************
*** 46,49 ****
--- 50,72 ----
/**
+ * Create a new Intelligence score. The Intelligence score is generated
+ * using the standard method.
+ */
+ inline Intelligence::Intelligence ():
+ ogs::core::Ability (ogs::core::Ability::CHA) {
+ // empty constructor body
+ }
+
+ /**
+ * Create a new Strength score using a method.
+ *
+ * @param method A method for generating ability scores.
+ */
+ inline Intelligence::Intelligence (ogs::core::Ability::Method& method):
+ ogs::core::Ability (ogs::core::Ability::STR, method) {
+ // empty constructor body
+ }
+
+ /**
* Determine highest spell level that can be cast. A negative value
* indicates that spells can not be cast based on this ability.
***************
*** 51,55 ****
* @return Highest spell level.
*/
! inline int Intelligence::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
--- 74,79 ----
* @return Highest spell level.
*/
! inline int
! Intelligence::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
***************
*** 60,64 ****
* @return Number of bonus spells per spell level.
*/
! inline Ability::SpellCounts Intelligence::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
--- 84,89 ----
* @return Number of bonus spells per spell level.
*/
! inline SpellCounts
! Intelligence::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
Index: Wisdom.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/magic/abilities/Wisdom.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Wisdom.h 8 Apr 2003 21:43:12 -0000 1.2
--- Wisdom.h 18 Apr 2003 01:41:06 -0000 1.3
***************
*** 26,31 ****
# define OGS_MAGIC_ABILITIES_WISDOM_H
! # include <ogs/core/abilities/Wisdom.h>
# include <ogs/magic/Ability.h>
# include <ogs/magic/abilities/Namespace.h>
--- 26,32 ----
# define OGS_MAGIC_ABILITIES_WISDOM_H
! # include <ogs/core/Ability.h>
# include <ogs/magic/Ability.h>
+ # include <ogs/magic/Types.h>
# include <ogs/magic/abilities/Namespace.h>
***************
*** 38,44 ****
* determining the highest spell level and bonus number of spells.
*/
! class Wisdom: public ogs::core::abilities::Wisdom,
public ogs::magic::Ability {
public:
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
--- 39,48 ----
* determining the highest spell level and bonus number of spells.
*/
! class Wisdom: public ogs::core::Ability,
public ogs::magic::Ability {
public:
+ Wisdom ();
+ Wisdom (ogs::core::Ability::Method& method);
+
int getHighestSpellLevel () const;
SpellCounts getBonusSpells () const;
***************
*** 46,49 ****
--- 50,72 ----
/**
+ * Create a new Wisdom score. The Wisdom score is generated using
+ * the standard method.
+ */
+ inline Wisdom::Wisdom ():
+ ogs::core::Ability (ogs::core::Ability::CHA) {
+ // empty constructor body
+ }
+
+ /**
+ * Create a new Strength score using a method.
+ *
+ * @param method A method for generating ability scores.
+ */
+ inline Wisdom::Wisdom (ogs::core::Ability::Method& method):
+ ogs::core::Ability (ogs::core::Ability::STR, method) {
+ // empty constructor body
+ }
+
+ /**
* Determine highest spell level that can be cast. A negative value
* indicates that spells can not be cast based on this ability.
***************
*** 51,55 ****
* @return Highest spell level.
*/
! inline int Wisdom::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
--- 74,79 ----
* @return Highest spell level.
*/
! inline int
! Wisdom::getHighestSpellLevel () const {
return (Ability::getHighestSpellLevel (getCurrentScore ()));
}
***************
*** 60,64 ****
* @return Number of bonus spells per spell level.
*/
! inline Ability::SpellCounts Wisdom::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
--- 84,89 ----
* @return Number of bonus spells per spell level.
*/
! inline SpellCounts
! Wisdom::getBonusSpells () const {
return (Ability::getBonusSpells ((getModifier ()).getValue ()));
}
|