From 1b63a82a505274c6d428250dfcec6d9ef21c2305 Mon Sep 17 00:00:00 2001 From: Deskull Date: Tue, 4 Mar 2014 23:07:47 +0900 Subject: [PATCH] Implement Get in Discipline class. --- Deeangband/Deeangband.h | 1 + Deeangband/Discipline.cpp | 5 +++++ Deeangband/Discipline.h | 20 +++++++++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h index 30067d4..ddc5c3a 100644 --- a/Deeangband/Deeangband.h +++ b/Deeangband/Deeangband.h @@ -66,5 +66,6 @@ typedef int Status; /*!< typedef int HP; /*!< HP‚̕ϐ”Œ^ */ typedef int MP; /*!< MP‚̕ϐ”Œ^ */ typedef int SOUL; /*!< ƒ\ƒEƒ‹‚̕ϐ”Œ^ */ +typedef int DISCIPLINE_POINT; /*!< C—{’l‚̕ϐ”Œ^ */ diff --git a/Deeangband/Discipline.cpp b/Deeangband/Discipline.cpp index 1deff26..46aee9c 100644 --- a/Deeangband/Discipline.cpp +++ b/Deeangband/Discipline.cpp @@ -25,3 +25,8 @@ Discipline::Discipline(void) Discipline::~Discipline(void) { } + +DISCIPLINE_POINT Discipline::Get(DISCIPLINE_TYPE typ) +{ + return this->disciplinePoint[typ]; +} diff --git a/Deeangband/Discipline.h b/Deeangband/Discipline.h index 7255d3e..cb0cd75 100644 --- a/Deeangband/Discipline.h +++ b/Deeangband/Discipline.h @@ -9,11 +9,12 @@ #pragma once #include "stdafx.h" +#include "Deeangband.h" /*! * @brief C—{‘®«‚Ì—ñ‹“‘Ì */ -enum DISCIPLINE_TYPE +typedef enum DISCIPLINE_TYPE { DISCIPLINE_TYPE_GOOD, //!< C—{‘®«:‘P DISCIPLINE_TYPE_EVIL, //!< C—{‘®«:ˆ« @@ -21,7 +22,7 @@ enum DISCIPLINE_TYPE DISCIPLINE_TYPE_CHAOS, //!< C—{‘®«:¬“× DISCIPLINE_TYPE_BALANCE, //!< C—{‘®«:“V”‰ MAX_DISCIPLINE_TYPES, //!< C—{‘®«” -}; +} DISCIPLINE_TYPE; /*! @@ -36,7 +37,7 @@ private: public: /*! - * @brief DisciplineƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ + * @brief DisciplineƒNƒ‰ƒX‚̃Rƒ“ƒXƒgƒ‰ƒNƒ^ * @param good ‘P‚̏C—{’l * @param evil ˆ«‚̏C—{’l * @param order ’˜‚̏C—{’l @@ -45,7 +46,20 @@ public: */ Discipline::Discipline(int good, int evil, int order, int chaos, int balance); + /*! + * @brief DisciplineƒNƒ‰ƒX‚̃Rƒ“ƒXƒgƒ‰ƒNƒ^ + */ Discipline::Discipline(void); + /*! + * @brief DisciplineƒNƒ‰ƒX‚̃fƒXƒgƒ‰ƒNƒ^ + */ Discipline::~Discipline(void); + + /*! + * @brief C—{’l‚ðŽæ“¾‚·‚é + * @param id C—{’l‚ÌID + * return C—{’l + */ + DISCIPLINE_POINT Discipline::Get(DISCIPLINE_TYPE typ); }; -- 2.11.0