Add currentDiscipline member to Creature class.

diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp
index 02ed03f..99e8d16 100644 (file)
--- a/Deeangband/Creature.cpp
+++ b/Deeangband/Creature.cpp
@@ -163,3 +163,9 @@ Status Creature::GetMaxMAXStatus(CREATURE_STATUS stat)
 {
        return status.maxMax[stat];
 }
+
+int Creature::GetCurrentDiscipilne(DISCIPLINE_TYPE disc)
+{
+       return 0;
+       //return this->currentDiscipilne;
+}

diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h
index e0ef944..3101f23 100644 (file)
--- a/Deeangband/Creature.h
+++ b/Deeangband/Creature.h
@@ -1,15 +1,16 @@
 /*!
-    @file Creature.h
-    @brief \83Q\81[\83\80\92\86\82Ì\83N\83\8a\81[\83`\83\83\81[\82Æ\95t\90\8f\97v\91f\82Ì\83v\83\8d\83g\83^\83C\83v
-    @date 2013/12/11
-    @author Deskull
-    2013 Sikabane Works.
-*/
+ * @file Creature.h
+ * @brief \83Q\81[\83\80\92\86\82Ì\83N\83\8a\81[\83`\83\83\81[\82Æ\95t\90\8f\97v\91f\82Ì\83v\83\8d\83g\83^\83C\83v
+ * @date 2013/12/11
+ * @author Deskull
+ * 2013 Sikabane Works.
+ */
 
 #pragma once
 
 #include "stdafx.h"
 #include "Coordinates.h"
+#include "Discipline.h"
 #include "Effect.h"
 #include "Floor.h"
 #include "Item.h"
@@ -69,6 +70,8 @@ private:
        SOUL currentSoul; /*!< \8c»\8dÝ\82Ì\83\\83E\83\8b\92l */
        SOUL maxSoul;     /*!< \83\\83E\83\8b\8dÅ\91å\93\9e\92B\92l */
 
+       Discipline currentDiscipilne; /*!< \8c»\8dÝ\82Ì\8fC\97{\92l */
+
        StatusTable status;  /*!< \83X\83e\81[\83^\83X */
        SavingTable savings; /*!< \83Z\81[\83r\83\93\83O */
 
@@ -253,5 +256,11 @@ public:
         */
        Status Creature::GetMaxMAXStatus(CREATURE_STATUS stat);
 
+       /*!
+        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\8dÝ\8fC\97{\92l\82ð\95Ô\82·
+        * @param stat \8eæ\93¾\82µ\82½\82¢\8c»\8dÝ\8fC\97{\92l\82ÌID
+        * @return \8c»\8dÝ\8fC\97{\92l
+        */
+       int Creature::GetCurrentDiscipilne(DISCIPLINE_TYPE disc);
 };
 

diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h
index eaa6ab0..30067d4 100644 (file)
--- a/Deeangband/Deeangband.h
+++ b/Deeangband/Deeangband.h
@@ -21,9 +21,10 @@ typedef enum GAME_COMMAND
  */
 typedef enum PLAY_EXIT_CODE
 {
-       PLAY_EXIT_NONE,
-       PLAY_EXIT_DEAD,
-       PLAY_EXIT_QUIT
+       PLAY_EXIT_NONE,  //!<\83v\83\8c\83C\8fI\97¹\83R\81[\83h:\82È\82µ(\83v\83\8c\83C\8cp\91±)
+       PLAY_EXIT_DEAD,  //!<\83v\83\8c\83C\8fI\97¹\83R\81[\83h:\83Q\81[\83\80\83I\81[\83o\81[
+       PLAY_EXIT_QUIT,  //!<\83v\83\8c\83C\8fI\97¹\83R\81[\83h:\92Ê\8fí\8fI\97¹
+       PLAY_EXIT_ERROR, //!<\83v\83\8c\83C\8fI\97¹\83R\81[\83h:\88Ù\8fí\8fI\97¹
 } PLAY_EXIT_CODE;
 
 /*!

diff --git a/Deeangband/Discipline.h b/Deeangband/Discipline.h
index cc532c2..7255d3e 100644 (file)
--- a/Deeangband/Discipline.h
+++ b/Deeangband/Discipline.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "stdafx.h"
-#include "CreatureTemplate.h"
 
 /*!
  * @brief \8fC\97{\91®\90«\82Ì\97ñ\8b\93\91Ì