Add savings to Creature class.

diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp
index 5a6c7c9..02ed03f 100644 (file)
--- a/Deeangband/Creature.cpp
+++ b/Deeangband/Creature.cpp
@@ -124,19 +124,19 @@ MP Creature::GetNorMaxMP(void)
        return maxMaxMp;
 }
 
-AC Creature::GetAC(void)
+AC Creature::GetArmorSaving(void)
 {
-       return 10;
+       return savings.armor;
 }
 
-EV Creature::GetEV(void)
+EV Creature::GetEvasionSaving(void)
 {
-       return 10;
+       return savings.evasion;
 }
 
-VO Creature::GetVO(void)
+VO Creature::GetVolitionSaving(void)
 {
-       return 10;
+       return savings.volition;
 }
 
 SOUL Creature::GetCurrentSoul(void)

diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h
index 7a2f9fa..18c2b35 100644 (file)
--- a/Deeangband/Creature.h
+++ b/Deeangband/Creature.h
@@ -137,7 +137,6 @@ public:
         */
        Creature::Creature(ID id, Tag tag, GameWorld *gameWorld);
 
-
        Creature::Creature(void);
 
        Creature::~Creature(void);
@@ -198,22 +197,22 @@ public:
        MP Creature::GetNorMaxMP(void);
 
        /*!
-        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»AC\82ð\95Ô\82·
-        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»AC
+        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\91\95\8db\83Z\81[\83r\83\93\83O\92l\82ð\95Ô\82·
+        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\91\95\8db\83Z\81[\83r\83\93\83O\92l
         */
-       AC Creature::GetAC(void);
+       AC Creature::GetArmorSaving(void);
 
        /*!
-        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»EV\82ð\95Ô\82·
-        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»EV
+        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\89ñ\94ð\83Z\81[\83r\83\93\83O\92l\82ð\95Ô\82·
+        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\89ñ\94ð\83Z\81[\83r\83\93\83O\92l
         */
-       EV Creature::GetEV(void);
+       EV Creature::GetEvasionSaving(void);
 
        /*!
-        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»VO\82ð\95Ô\82·
-        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»VO
+        * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\88Ó\8ev\83Z\81[\83r\83\93\83O\92l\82ð\95Ô\82·
+        * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\88Ó\8ev\83Z\81[\83r\83\93\83O\92l
         */
-       VO Creature::GetVO(void);
+       VO Creature::GetVolitionSaving(void);
 
        /*!
         * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\8c»\8dÝ\88Ê\92u\82ð\95Ô\82·

diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index b465a28..5c3a70c 100644 (file)
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -180,9 +180,9 @@ void GameSurfaceSDL::drawCreatureStatus(Creature *creaturePtr)
        sprintf_s(statusBuf[POS_NAME], STATUS_BUFSIZE, "\96¼\91O:%s", creaturePtr->GetName().c_str()); 
        sprintf_s(statusBuf[POS_HP], STATUS_BUFSIZE, "HP:%5d/%5d", creaturePtr->GetCurHP(), creaturePtr->GetMaxHP()); 
        sprintf_s(statusBuf[POS_MP], STATUS_BUFSIZE, "MP:%5d/%5d", creaturePtr->GetCurMP(), creaturePtr->GetMaxMP()); 
-       sprintf_s(statusBuf[POS_AC], STATUS_BUFSIZE, "AC:%4d", creaturePtr->GetAC()); 
-       sprintf_s(statusBuf[POS_EV], STATUS_BUFSIZE, "EV:%4d", creaturePtr->GetEV()); 
-       sprintf_s(statusBuf[POS_VO], STATUS_BUFSIZE, "VO:%4d", creaturePtr->GetVO()); 
+       sprintf_s(statusBuf[POS_AC], STATUS_BUFSIZE, "AC:%4d", creaturePtr->GetArmorSaving()); 
+       sprintf_s(statusBuf[POS_EV], STATUS_BUFSIZE, "EV:%4d", creaturePtr->GetEvasionSaving()); 
+       sprintf_s(statusBuf[POS_VO], STATUS_BUFSIZE, "VO:%4d", creaturePtr->GetVolitionSaving()); 
        sprintf_s(statusBuf[POS_STR], STATUS_BUFSIZE, "\98r\97Í:%4d", creaturePtr->GetCurrentStatus(CS_STR)); 
        sprintf_s(statusBuf[POS_INT], STATUS_BUFSIZE, "\92m\97Í:%4d", creaturePtr->GetCurrentStatus(CS_INT)); 
        sprintf_s(statusBuf[POS_WIS], STATUS_BUFSIZE, "\8c«\82³:%4d", creaturePtr->GetCurrentStatus(CS_WIS));