From: Deskull <deskull@users.sourceforge.jp>
Date: Thu, 6 Mar 2014 12:17:20 +0000 (+0900)
Subject: Add disciplinePlus to Karma class.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b95ae18a4e898deea34c1941c74fc30dea5f3eb4;p=deeangband%2FDeeangband-new.git

Add disciplinePlus to Karma class.
---

diff --git a/Deeangband/Karma.cpp b/Deeangband/Karma.cpp
index b87d25f..b2d35b4 100644
--- a/Deeangband/Karma.cpp
+++ b/Deeangband/Karma.cpp
@@ -11,11 +11,13 @@
 
 Karma::Karma(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld)
 {
+	Karma();
 	return;
 }
 
 Karma::Karma(void)
 {
+	this->desciplinePlus.SetPoint(0, 0, 0, 0, 0);
 	return;
 }
 
@@ -23,3 +25,9 @@ Karma::~Karma(void)
 {
 	return;
 }
+
+const Discipline* Karma::GetDiscipline(void)
+{
+	return &(this->desciplinePlus);
+}
+
diff --git a/Deeangband/Karma.h b/Deeangband/Karma.h
index 7e3679e..c43095d 100644
--- a/Deeangband/Karma.h
+++ b/Deeangband/Karma.h
@@ -17,41 +17,41 @@
  */
 enum KARMA_TYPE
 {
-	KARMA_IDEAL,       //!> ƒJƒ‹ƒ}:—‘z
-	KARMA_PRAGMATIC,   //!> ƒJƒ‹ƒ}:ŽÀ—˜
-	KARMA_HARMONY,     //!> ƒJƒ‹ƒ}:’²˜a
-	KARMA_ALOOFNESS,   //!> ƒJƒ‹ƒ}:ŒÇ‚
-	KARMA_TEMPERATE,   //!> ƒJƒ‹ƒ}:ß§
-	KARMA_INDULGENT,   //!> ƒJƒ‹ƒ}:–z•ú
-	KARMA_CHASTE,      //!> ƒJƒ‹ƒ}:’åß
-	KARMA_PASSION,     //!> ƒJƒ‹ƒ}:î—~
-	KARMA_MERCY,       //!> ƒJƒ‹ƒ}:Žœ”ß
-	KARMA_CRUELTY,     //!> ƒJƒ‹ƒ}:—⍓
-	KARMA_HONEST,      //!> ƒJƒ‹ƒ}:½ŽÀ
-	KARMA_CLEVER,      //!> ƒJƒ‹ƒ}:àÂàÏ
-	KARMA_FORGIVING,   //!> ƒJƒ‹ƒ}:Š°‘å
-	KARMA_AVENGE,      //!> ƒJƒ‹ƒ}:Ž·”O
-	KARMA_GENEROUS,    //!> ƒJƒ‹ƒ}:œ—’W
-	KARMA_GREED,       //!> ƒJƒ‹ƒ}:æ×~
-	KARMA_MODEST,      //!> ƒJƒ‹ƒ}:Œª‹•
-	KARMA_PROUD,       //!> ƒJƒ‹ƒ}:˜ü–
-	KARMA_TRSUTING,    //!> ƒJƒ‹ƒ}:ƒ–p
-	KARMA_SUSPICION,   //!> ƒJƒ‹ƒ}:àȋ^
-	KARMA_ZEALOTRY,    //!> ƒJƒ‹ƒ}:”MS
-	KARMA_SCEPTICISM,  //!> ƒJƒ‹ƒ}:‰ù‹^
-	KARMA_DELIGENT,    //!> ƒJƒ‹ƒ}:‹Î•×
-	KARMA_IDLENESS,    //!> ƒJƒ‹ƒ}:–³ˆ×
-	KARMA_CREATION,    //!> ƒJƒ‹ƒ}:‘n‘¢
-	KARMA_DESTRUCTION, //!> ƒJƒ‹ƒ}:”j‰ó
-	KARMA_PLEASURE,    //!> ƒJƒ‹ƒ}:‰õŠy
-	KARMA_PAIN,        //!> ƒJƒ‹ƒ}:‹ê’É
-	KARMA_WEALTH,      //!> ƒJƒ‹ƒ}:•x—T
-	KARMA_PRESITIGE,   //!> ƒJƒ‹ƒ}:‘¸Œµ
-	KARMA_ERUDITION,   //!> ƒJƒ‹ƒ}:”ŽŽ¯
-	KARMA_BRAVE,       //!> ƒJƒ‹ƒ}:—E–Ò
-	KARMA_DISCRETION,  //!> ƒJƒ‹ƒ}:Žv—¶
-	KARMA_FORTUNE,     //!> ƒJƒ‹ƒ}:“V‰^
-	MAX_KARMAS,        //!> ƒJƒ‹ƒ}”
+	KARMA_IDEAL,       //!< ƒJƒ‹ƒ}:—‘z
+	KARMA_PRAGMATIC,   //!< ƒJƒ‹ƒ}:ŽÀ—˜
+	KARMA_HARMONY,     //!< ƒJƒ‹ƒ}:’²˜a
+	KARMA_ALOOFNESS,   //!< ƒJƒ‹ƒ}:ŒÇ‚
+	KARMA_TEMPERATE,   //!< ƒJƒ‹ƒ}:ß§
+	KARMA_INDULGENT,   //!< ƒJƒ‹ƒ}:–z•ú
+	KARMA_CHASTE,      //!< ƒJƒ‹ƒ}:’åß
+	KARMA_PASSION,     //!< ƒJƒ‹ƒ}:î—~
+	KARMA_MERCY,       //!< ƒJƒ‹ƒ}:Žœ”ß
+	KARMA_CRUELTY,     //!< ƒJƒ‹ƒ}:—⍓
+	KARMA_HONEST,      //!< ƒJƒ‹ƒ}:½ŽÀ
+	KARMA_CLEVER,      //!< ƒJƒ‹ƒ}:àÂàÏ
+	KARMA_FORGIVING,   //!< ƒJƒ‹ƒ}:Š°‘å
+	KARMA_AVENGE,      //!< ƒJƒ‹ƒ}:Ž·”O
+	KARMA_GENEROUS,    //!< ƒJƒ‹ƒ}:œ—’W
+	KARMA_GREED,       //!< ƒJƒ‹ƒ}:æ×~
+	KARMA_MODEST,      //!< ƒJƒ‹ƒ}:Œª‹•
+	KARMA_PROUD,       //!< ƒJƒ‹ƒ}:˜ü–
+	KARMA_TRSUTING,    //!< ƒJƒ‹ƒ}:ƒ–p
+	KARMA_SUSPICION,   //!< ƒJƒ‹ƒ}:àȋ^
+	KARMA_ZEALOTRY,    //!< ƒJƒ‹ƒ}:”MS
+	KARMA_SCEPTICISM,  //!< ƒJƒ‹ƒ}:‰ù‹^
+	KARMA_DELIGENT,    //!< ƒJƒ‹ƒ}:‹Î•×
+	KARMA_IDLENESS,    //!< ƒJƒ‹ƒ}:–³ˆ×
+	KARMA_CREATION,    //!< ƒJƒ‹ƒ}:‘n‘¢
+	KARMA_DESTRUCTION, //!< ƒJƒ‹ƒ}:”j‰ó
+	KARMA_PLEASURE,    //!< ƒJƒ‹ƒ}:‰õŠy
+	KARMA_PAIN,        //!< ƒJƒ‹ƒ}:‹ê’É
+	KARMA_WEALTH,      //!< ƒJƒ‹ƒ}:•x—T
+	KARMA_PRESITIGE,   //!< ƒJƒ‹ƒ}:‘¸Œµ
+	KARMA_ERUDITION,   //!< ƒJƒ‹ƒ}:”ŽŽ¯
+	KARMA_BRAVE,       //!< ƒJƒ‹ƒ}:—E–Ò
+	KARMA_DISCRETION,  //!< ƒJƒ‹ƒ}:Žv—¶
+	KARMA_FORTUNE,     //!< ƒJƒ‹ƒ}:“V‰^
+	MAX_KARMAS,        //!< ƒJƒ‹ƒ}”
 };
 
 /*! 
@@ -61,6 +61,7 @@ enum KARMA_TYPE
 class Karma : public CreatureTemplate
 {
 private:
+	Discipline desciplinePlus; //!< C—{’lC³
 
 public:
 
@@ -72,8 +73,19 @@ public:
 	 */
 	Karma::Karma(ID id, Tag tag, GameWorld *gameWorld);
 
+	/*! 
+	 * @brief KarmaƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(‰Šú’l‘ã“ü)
+	 */
 	Karma::Karma(void);
 
+	/*! 
+	 * @brief KarmaƒNƒ‰ƒXƒfƒXƒgƒ‰ƒNƒ^
+	 */
 	Karma::~Karma(void);
 
+	/*! 
+	 * @brief C—{’lC³‚ð•Ô‚·
+	 * @return C—{’l‚ÌŽQÆƒ|ƒCƒ“ƒ^
+	 */
+	const Discipline* Karma::GetDiscipline(void);
 };