Fix type of members in GameSaving class.

diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h
index 8998c80..e3e7844 100644 (file)
--- a/Deeangband/Deeangband.h
+++ b/Deeangband/Deeangband.h
@@ -67,5 +67,15 @@ typedef int HP;     /*!< HP
 typedef int MP;     /*!< MP\82Ì\95Ï\90\94\8c^ */
 typedef int SOUL;   /*!< \83\\83E\83\8b\82Ì\95Ï\90\94\8c^ */
 typedef int DISCIPLINE_POINT; /*!< \8fC\97{\92l\82Ì\95Ï\90\94\8c^ */
-
+typedef int AC;     //!< \8aæ\8c\92\90«
+typedef int EV;     //!< \89ñ\94ð\97Í
+typedef int VO;     //!< \88Ó\8eu\97Í
+typedef int ID;     //!< \83Q\81[\83\80\97v\91fID
+typedef string Tag; //!< \83Q\81[\83\80\97v\91f\95¶\8e\9a\97ñID
+typedef int Weight; //!< \8fd\97Ê
+typedef int DEPTH;  //!< \8aK\91w\90[\93x
+typedef int NUMBER; //!< \8cÂ\90\94
+typedef int PPM;    //!< \95S\96\9c\95ª\97¦
+typedef int MapLength; //!<\83}\83b\83v\8b\97\97£
+typedef int POWER;     //!<\8cø\97Í
 

diff --git a/Deeangband/GameElement.h b/Deeangband/GameElement.h
index 41b5699..f86f1d5 100644 (file)
--- a/Deeangband/GameElement.h
+++ b/Deeangband/GameElement.h
@@ -10,17 +10,7 @@
 
 #include "Deeangband.h"
 
-typedef int ID;     //!< \83Q\81[\83\80\97v\91fID
-typedef string Tag; //!< \83Q\81[\83\80\97v\91f\95¶\8e\9a\97ñID
-typedef int Weight; //!< \8fd\97Ê
-typedef int AC;     //!< \8aæ\8c\92\90«
-typedef int EV;     //!< \89ñ\94ð\97Í
-typedef int VO;     //!< \88Ó\8eu\97Í
-typedef int DEPTH;  //!< \8aK\91w\90[\93x
-typedef int NUMBER; //!< \8cÂ\90\94
-typedef int PPM;    //!< \95S\96\9c\95ª\97¦
-typedef int MapLength; //!<\83}\83b\83v\8b\97\97£
-typedef int POWER;     //!<\8cø\97Í
+
 
 /*!
  * @struct Color

diff --git a/Deeangband/SavingTable.cpp b/Deeangband/SavingTable.cpp
index 5d3c707..4fdc566 100644 (file)
--- a/Deeangband/SavingTable.cpp
+++ b/Deeangband/SavingTable.cpp
@@ -32,17 +32,17 @@ void SavingTable::Set(BASE_STATUS armor, BASE_STATUS evasion, BASE_STATUS voliti
        this->volition = volition;
 }
 
-const BASE_STATUS SavingTable::GetArmor(void)
+const AC SavingTable::GetArmor(void)
 {
        return this->armor;
 }
 
-const BASE_STATUS SavingTable::GetEvasion(void)
+const EV SavingTable::GetEvasion(void)
 {
        return this->evasion;
 }
 
-const BASE_STATUS SavingTable::GetVolition(void)
+const VO SavingTable::GetVolition(void)
 {
        return this->volition;
 }

diff --git a/Deeangband/SavingTable.h b/Deeangband/SavingTable.h
index c888981..a6c1a2b 100644 (file)
--- a/Deeangband/SavingTable.h
+++ b/Deeangband/SavingTable.h
@@ -18,9 +18,9 @@
 class SavingTable
 {
 private:
-       BASE_STATUS armor;    /*!< \91\95\8db\83Z\81[\83u\92l */
-       BASE_STATUS evasion;  /*!< \89ñ\94ð\83Z\81[\83u\92l */
-       BASE_STATUS volition; /*!< \88Ó\8ev\83Z\81[\83u\92l */
+       AC armor;    /*!< \91\95\8db\83Z\81[\83u\92l */
+       EV evasion;  /*!< \89ñ\94ð\83Z\81[\83u\92l */
+       VO volition; /*!< \88Ó\8ev\83Z\81[\83u\92l */
 
 public:
 
@@ -37,11 +37,11 @@ public:
 
        void SavingTable::Set(BASE_STATUS armor, BASE_STATUS evasion, BASE_STATUS volition);
 
-       const BASE_STATUS SavingTable::GetArmor(void);
+       const AC SavingTable::GetArmor(void);
 
-       const BASE_STATUS SavingTable::GetEvasion(void);
+       const EV SavingTable::GetEvasion(void);
 
-       const BASE_STATUS SavingTable::GetVolition(void);
+       const VO SavingTable::GetVolition(void);
 
        /*!
         * @brief +=\89\89\8eZ\8eq\82É\82æ\82é\8dÀ\95W\89Á\8eZ