Remove duplicated GetName() of TrapBase class.

diff --git a/Deeangband/Trap.h b/Deeangband/Trap.h
index ef4fc32..3e2d834 100644 (file)
--- a/Deeangband/Trap.h
+++ b/Deeangband/Trap.h
@@ -25,6 +25,13 @@ namespace Deeangband
                Coordinates position; //!<\8f\8a\8dÝ\8dÀ\95W
 
                friend class boost::serialization::access;
+
+               /*!
+               * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\82ð\90Ý\92è\82·\82é
+               * @param archive \83A\81[\83J\83C\83u\89»\82·\82é\83N\83\89\83X\82Ì\83A\83h\83\8c\83X
+               * @param version \83t\83@\83C\83\8b\83o\81[\83W\83\87\83\93
+               * @return XMLSerialize\83e\83\93\83v\83\8c\81[\83g
+               */
                template<class Archive> void serialize(Archive &archive, const unsigned int) 
                {
                        archive & BOOST_SERIALIZATION_NVP(floorID);
@@ -41,8 +48,14 @@ namespace Deeangband
                */
                Trap::Trap(ID id, TAG tag, GameWorld *gameWorld);
 
+               /*! 
+               * @brief Trap\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
+               */
                Trap::Trap(void);
 
+               /*! 
+               * @brief Trap\83N\83\89\83X\83f\83X\83g\83\89\83N\83^
+               */
                Trap::~Trap(void);
 
        };

diff --git a/Deeangband/TrapBase.cpp b/Deeangband/TrapBase.cpp
index 1553cf8..b3bf9d0 100644 (file)
--- a/Deeangband/TrapBase.cpp
+++ b/Deeangband/TrapBase.cpp
@@ -26,10 +26,4 @@ namespace Deeangband
        {
                return;
        }
-
-       std::string TrapBase::GetName(void)
-       {
-               return this->name;
-       }
-
 }
\ No newline at end of file

diff --git a/Deeangband/TrapBase.h b/Deeangband/TrapBase.h
index 2a34e69..f2ea2a4 100644 (file)
--- a/Deeangband/TrapBase.h
+++ b/Deeangband/TrapBase.h
@@ -1,10 +1,10 @@
 /*!
- * @file TrapBase.h
- * @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\83x\81[\83X\82Ì\83v\83\8d\83g\83^\83C\83v
- * @date 2014/02/01
- * @author Deskull
- * 2014 Sikabane Works.
- */
+* @file TrapBase.h
+* @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\83x\81[\83X\82Ì\83v\83\8d\83g\83^\83C\83v
+* @date 2014/02/01
+* @author Deskull
+* 2014 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "GameElement.h"
@@ -12,37 +12,46 @@
 namespace Deeangband
 {
 
-/*!
- * @class TrapBase
- * @brief \83g\83\89\83b\83v\83x\81[\83X\82Ì\83N\83\89\83X
- */
-class TrapBase : public GameElement
-{
-       std::string name;
-
-       friend class boost::serialization::access;
-       template<class Archive> void serialize(Archive &archive, const unsigned int) 
+       /*!
+       * @class TrapBase
+       * @brief \83g\83\89\83b\83v\83x\81[\83X\82Ì\83N\83\89\83X
+       */
+       class TrapBase : public GameElement
        {
-               archive & BOOST_SERIALIZATION_NVP(name);
-       }
-
-private:
-
-public:
-
-       /*! 
-        * @brief TrapBase\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(GameElement\83\81\83\93\83o\91Î\89\9e)
-        * @param id GameElement\82ÌID
-        * @param tag GameElement\82Ì\83^\83O
-        * @param gameWorld \8f\8a\91®\8c³gameWorld\8eQ\8fÆ\83|\83C\83\93\83^
-        */
-       TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld);
-
-       TrapBase::TrapBase(void);
-
-       TrapBase::~TrapBase(void);
-
-       std::string TrapBase::GetName(void);
-};
+               friend class boost::serialization::access;
+
+               /*!
+               * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\82ð\90Ý\92è\82·\82é
+               * @param archive \83A\81[\83J\83C\83u\89»\82·\82é\83N\83\89\83X\82Ì\83A\83h\83\8c\83X
+               * @param version \83t\83@\83C\83\8b\83o\81[\83W\83\87\83\93
+               * @return XMLSerialize\83e\83\93\83v\83\8c\81[\83g
+               */
+               template<class Archive> void serialize(Archive &archive, const unsigned int) 
+               {
+                       archive & BOOST_SERIALIZATION_NVP(name);
+               }
+
+       private:
+
+       public:
+
+               /*! 
+               * @brief TrapBase\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(GameElement\83\81\83\93\83o\91Î\89\9e)
+               * @param id GameElement\82ÌID
+               * @param tag GameElement\82Ì\83^\83O
+               * @param gameWorld \8f\8a\91®\8c³gameWorld\8eQ\8fÆ\83|\83C\83\93\83^
+               */
+               TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld);
+
+               /*! 
+               * @brief TrapBase\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
+               */
+               TrapBase::TrapBase(void);
+
+               /*! 
+               * @brief TrapBase\83N\83\89\83X\83f\83X\83g\83\89\83N\83^
+               */
+               TrapBase::~TrapBase(void);
+       };
 
 }
\ No newline at end of file