Refactor of Square class.

diff --git a/Deeangband/Square.cpp b/Deeangband/Square.cpp
index ceea412..d896462 100644 (file)
--- a/Deeangband/Square.cpp
+++ b/Deeangband/Square.cpp
@@ -9,17 +9,17 @@
 #include "stdafx.h"
 #include "Square.h"
 
-Square::Square(Floor *floor_ptr)
+Square::Square(Floor *floorPtr)
 {
-       this->floor_ptr = floor_ptr;
-       feature_id = 0;
+       this->floorPtr = floorPtr;
+       featureID = 0;
 }
 
 Square::~Square()
 {
 }
 
-bool Square::take_effect(Effect *effectPtr, POWER amount)
+bool Square::TakeEffect(Effect *effectPtr, POWER amount)
 {
        if(effectPtr)
        {
@@ -30,7 +30,7 @@ bool Square::take_effect(Effect *effectPtr, POWER amount)
 
 ID Square::getFeatureID(void)
 {
-       return this->feature_id;
+       return this->featureID;
 }
 
 Feature *Square::getFeaturePtr(void)

diff --git a/Deeangband/Square.h b/Deeangband/Square.h
index f3fb483..30a8961 100644 (file)
--- a/Deeangband/Square.h
+++ b/Deeangband/Square.h
@@ -19,16 +19,17 @@
 class Square : public GameElement
 {
 private:
-       Floor *floor_ptr; //!<\8f\8a\91®\83t\83\8d\83A\8eQ\8fÆ\83|\83C\83\93\83^
-       ID feature_id;    //!<\92n\8c`ID
-       HP hitPoint;      //!<\92n\8c`HP
+       Floor *floorPtr; //!<\8f\8a\91®\83t\83\8d\83A\8eQ\8fÆ\83|\83C\83\93\83^
+       ID featureID;    //!<\92n\8c`ID
+       HP hitPoint;     //!<\92n\8c`\8c»HP
+       HP maxPoint;     //!<\92n\8c`\8dÅ\91åHP
 public:
 
        /*! 
         * @brief Square\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(GameElement\83\81\83\93\83o\91Î\89\9e)
         * @param Floor \8f\8a\91®\8c³Floor\8eQ\8fÆ\83|\83C\83\93\83^
         */
-       Square::Square(Floor *floor_ptr);
+       Square::Square(Floor *floorPtr);
 
        Square::~Square();
 
@@ -50,6 +51,6 @@ public:
        /*!
         * @brief \8eó\82¯\82½\8cø\89Ê\82ð\8f\88\97\9d\82·\82é
         */
-       bool Square::take_effect(Effect *effectPtr, POWER amount);
+       bool Square::TakeEffect(Effect *effectPtr, POWER amount);
 
 };