Creature has HaveSymbol by subclass.

diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp
index ee2d9b1..baa7e0f 100644 (file)
--- a/Deeangband/Creature.cpp
+++ b/Deeangband/Creature.cpp
@@ -405,16 +405,6 @@ namespace Deeangband
                return this->campID;
        }
 
-       SYMBOL Creature::GetSymbol(void)
-       {
-               return this->symbol;
-       }
-
-       Color Creature::GetSymbolColor(void)
-       {
-               return this->symbolColor;
-       }
-
        bool Creature::Walk(DIRECTION dir)
        {
                this->position += Direction::DirectionVector[dir];

diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h
index 40ccbd1..113656d 100644 (file)
--- a/Deeangband/Creature.h
+++ b/Deeangband/Creature.h
@@ -16,6 +16,7 @@
 #include "Direction.h"
 #include "Effect.h"
 #include "Floor.h"
+#include "HaveSymbol.h"
 #include "Item.h"
 #include "GameConstants.h"
 #include "GameInstance.h"
@@ -58,7 +59,7 @@ namespace Deeangband
        * <li>\8f\8a\8e\9d\83X\83L\83\8b\88ê\97\97 / Current Pisition</li>
        * </ul>
        */
-       class Creature : public GameInstance
+       class Creature : public GameInstance, public HaveSymbol
        {
        private:
 
@@ -96,10 +97,6 @@ namespace Deeangband
                std::vector<Item> itemList;  //!< \8f\8a\8e\9d\83A\83C\83e\83\80\83\8a\83X\83g
                std::map<TAG, SKILL_EXP> skillExpList; //!< \83X\83L\83\8b\8co\8c±\92l\83\8a\83X\83g
 
-               SYMBOL symbol;     //!< \83V\83\93\83{\83\8b\83L\83\83\83\89
-               Color symbolColor; //!< \83V\83\93\83{\83\8b\83J\83\89\81[
-               ID tileID;         //!< \83^\83C\83\8bID
-
                ID campID; //!< \8f\8a\91®\90w\89cID
 
                TURN turn; //!< \90¶\91¶\91\8d\83^\81[\83\93\90\94
@@ -460,18 +457,6 @@ namespace Deeangband
                ID Creature::GetCampID(void);
 
                /*!
-               * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\83V\83\93\83{\83\8b\82ð\95Ô\82·
-               * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\83V\83\93\83{\83\8b
-               */
-               SYMBOL Creature::GetSymbol(void);
-
-               /*!
-               * @brief \83N\83\8a\81[\83`\83\83\81[\82Ì\83V\83\93\83{\83\8b\83J\83\89\81[\82ð\95Ô\82·
-               * @return \83N\83\8a\81[\83`\83\83\81[\82Ì\83V\83\93\83{\83\8b\83J\83\89\81[
-               */
-               Color Creature::GetSymbolColor(void);
-
-               /*!
                * @brief XML\83V\83\8a\83A\83\89\83C\83Y\82É\82æ\82é\83Q\81[\83\80\83f\81[\83^\95Û\91¶\8f\88\97\9d
                * @return \82È\82µ
                */