OSDN Git Service

[BUGGY] Setting namespace.
authorDeskull <deskull@users.sourceforge.jp>
Mon, 7 Apr 2014 15:47:28 +0000 (00:47 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Mon, 7 Apr 2014 15:47:28 +0000 (00:47 +0900)
Deeangband/GameCampaign.cpp
Deeangband/GameCampaign.h
Deeangband/ItemTrait.cpp
Deeangband/ItemTrait.h
Deeangband/Karma.cpp
Deeangband/Karma.h
Deeangband/Trap.cpp
Deeangband/Trap.h

index 24d5d70..19f2bfd 100644 (file)
@@ -1,27 +1,32 @@
 /*!
- * @file GameCampaign.cpp
- * @brief \83Q\81[\83\80\90¢\8aE\82Ì\8eÀ\91\95
- * @date 2013/12/22
- * @author Deskull
- * 2013 Sikabane Works.
- */
+* @file GameCampaign.cpp
+* @brief \83Q\81[\83\80\90¢\8aE\82Ì\8eÀ\91\95
+* @date 2013/12/22
+* @author Deskull
+* 2013 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "GameCampaign.h"
 
-GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+namespace Deeangband
 {
-}
 
-GameCampaign::GameCampaign(void)
-{
-}
+       GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       {
+       }
 
-GameCampaign::~GameCampaign(void)
-{
-}
+       GameCampaign::GameCampaign(void)
+       {
+       }
 
-NAME GameCampaign::GetGameWorld(void)
-{
-       return this->name;
-}
+       GameCampaign::~GameCampaign(void)
+       {
+       }
+
+       NAME GameCampaign::GetGameWorld(void)
+       {
+               return this->name;
+       }
+
+}
\ No newline at end of file
index d25c4e2..fad0d0d 100644 (file)
@@ -1,71 +1,76 @@
 /*!
- * @file GameCampaign.h
- * @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\82Ì\83v\83\8d\83g\83^\83C\83v\90é\8c¾
- * @date 2013/12/22
- * @author Deskull
- * 2013 Sikabane Works.
- */
+* @file GameCampaign.h
+* @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\82Ì\83v\83\8d\83g\83^\83C\83v\90é\8c¾
+* @date 2013/12/22
+* @author Deskull
+* 2013 Sikabane Works.
+*/
 
 #pragma once
 
 #include "stdafx.h"
 #include "GameElement.h"
 
-/*!
- * @class GameCampaign
- * @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\82Ì\83N\83\89\83X
- * @details
- * <div>
- * \83L\83\83\83\93\83y\81[\83\93(Campaign)\82Í\81AD'angband\82Ì\8dÅ\82à\91å\82«\82È\83Q\81[\83\80\82Ì\8eå\91Ì\82Å\82 \82è\81\83Q\81[\83\80\82Ì*\8f\9f\97\98*\8fð\8c\8f\82Æ\8ae\8e©\83Q\81[\83\80\83\8b\81[\83\8b\82Ì\83I\83v\83V\83\87\83\93\91I\91ð\81A\8b­\90§\91I\91ð\81A\83N\83G\83X\83g\82É\82æ\82Á\82Ä\8d\\90¬\82³\82ê\82é\81B
- * <ul>
- * <li>\95Ï\8bð\88È\91O\82Ì*band\82Å\82Í\96»\89¤\81w\83\82\83\8b\83S\83X\81x\82È\82¢\82µ\81w\8d¬\93×\82Ì\83T\81[\83y\83\93\83g\81x\82Ì\91Å\93|\82ª\8fð\8c\8f\82Å\82 \82Á\82½*\8f\9f\97\98*\8fð\8c\8f\82Í\81AD'angband\82Å\82Í\82±\82Ì\83L\83\83\83\93\83y\81[\83\93\96\88\82É\82æ\82Á\82Ä\95Ï\89»\82·\82é\81B</li>
- * </ul>
- * </div>
- */
-class GameCampaign : GameElement
+namespace Deeangband
 {
-private:
-
-       NAME name; //!< \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼
-
-       friend class boost::serialization::access;
 
        /*!
-        * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\89»\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 fileVersion \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 fileVersion) 
+       * @class GameCampaign
+       * @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\82Ì\83N\83\89\83X
+       * @details
+       * <div>
+       * \83L\83\83\83\93\83y\81[\83\93(Campaign)\82Í\81AD'angband\82Ì\8dÅ\82à\91å\82«\82È\83Q\81[\83\80\82Ì\8eå\91Ì\82Å\82 \82è\81\83Q\81[\83\80\82Ì*\8f\9f\97\98*\8fð\8c\8f\82Æ\8ae\8e©\83Q\81[\83\80\83\8b\81[\83\8b\82Ì\83I\83v\83V\83\87\83\93\91I\91ð\81A\8b­\90§\91I\91ð\81A\83N\83G\83X\83g\82É\82æ\82Á\82Ä\8d\\90¬\82³\82ê\82é\81B
+       * <ul>
+       * <li>\95Ï\8bð\88È\91O\82Ì*band\82Å\82Í\96»\89¤\81w\83\82\83\8b\83S\83X\81x\82È\82¢\82µ\81w\8d¬\93×\82Ì\83T\81[\83y\83\93\83g\81x\82Ì\91Å\93|\82ª\8fð\8c\8f\82Å\82 \82Á\82½*\8f\9f\97\98*\8fð\8c\8f\82Í\81AD'angband\82Å\82Í\82±\82Ì\83L\83\83\83\93\83y\81[\83\93\96\88\82É\82æ\82Á\82Ä\95Ï\89»\82·\82é\81B</li>
+       * </ul>
+       * </div>
+       */
+       class GameCampaign : GameElement
        {
-               archive & BOOST_SERIALIZATION_NVP(name);
-       }
+       private:
+
+               NAME name; //!< \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼
+
+               friend class boost::serialization::access;
+
+               /*!
+               * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\89»\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 fileVersion \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 fileVersion) 
+               {
+                       archive & BOOST_SERIALIZATION_NVP(name);
+               }
+
 
+       public:
 
-public:
+               /*! 
+               * @brief GameCampaign \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^
+               */
+               GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld);
 
-       /*! 
-        * @brief GameCampaign \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^
-        */
-       GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld);
+               /*! 
+               * @brief GameCampaign \83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
+               */
+               GameCampaign::GameCampaign(void);
 
-       /*! 
-        * @brief GameCampaign \83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
-        */
-       GameCampaign::GameCampaign(void);
+               /*! 
+               * @brief GameCampaign \83N\83\89\83X\83f\83X\83g\83\89\83N\83^
+               */
+               GameCampaign::~GameCampaign(void);
 
-       /*! 
-        * @brief GameCampaign \83N\83\89\83X\83f\83X\83g\83\89\83N\83^
-        */
-       GameCampaign::~GameCampaign(void);
+               /*! 
+               * @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼\82ð\95Ô\82·
+               * @return \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼
+               */
+               std::string GameCampaign::GetGameWorld(void);
 
-       /*! 
-        * @brief \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼\82ð\95Ô\82·
-        * @return \83Q\81[\83\80\83L\83\83\83\93\83y\81[\83\93\96¼
-        */
-       std::string GameCampaign::GetGameWorld(void);
+       };
 
-};
+}
\ No newline at end of file
index 9085822..0221a47 100644 (file)
@@ -1,27 +1,32 @@
 /*!
- * @file ItemTrait.cpp
- * @brief \83Q\81[\83\80\92\86\82Ì\83A\83C\83e\83\80\93Á\90«\82ð\92è\8b`\82·\82é
- * @date 2013/12/22
- * @author Deskull
- * 2013 Sikabane Works.
- */
+* @file ItemTrait.cpp
+* @brief \83Q\81[\83\80\92\86\82Ì\83A\83C\83e\83\80\93Á\90«\82ð\92è\8b`\82·\82é
+* @date 2013/12/22
+* @author Deskull
+* 2013 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "ItemTrait.h"
 
-ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+namespace Deeangband
 {
-}
 
-ItemTrait::ItemTrait(void)
-{
-}
+       ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       {
+       }
 
-ItemTrait::~ItemTrait(void)
-{
-}
+       ItemTrait::ItemTrait(void)
+       {
+       }
 
-NAME ItemTrait::GetName(void)
-{
-       return this->name;
-}
+       ItemTrait::~ItemTrait(void)
+       {
+       }
+
+       NAME ItemTrait::GetName(void)
+       {
+               return this->name;
+       }
+
+}
\ No newline at end of file
index 65a3764..4be192a 100644 (file)
@@ -9,6 +9,9 @@
 #include "stdafx.h"
 #include "GameElement.h"
 
+namespace Deeangband
+{
+
 /*!
  * @class ItemTrait
  * @brief \83A\83C\83e\83\80\93Á\90«\82Ì\83N\83\89\83X
@@ -59,3 +62,5 @@ public:
         */
        std::string ItemTrait::GetName(void);
 };
+
+}
\ No newline at end of file
index b44aa03..cfb4e1f 100644 (file)
@@ -1,33 +1,37 @@
 /*!
- * @file Karma.cpp
- * @brief \83Q\81[\83\80\92\86\82Ì\83J\83\8b\83}\82ð\92è\8b`\82·\82é
- * @date 2013/02/01
- * @author Deskull
- * 2013 Sikabane Works.
- */
+* @file Karma.cpp
+* @brief \83Q\81[\83\80\92\86\82Ì\83J\83\8b\83}\82ð\92è\8b`\82·\82é
+* @date 2013/02/01
+* @author Deskull
+* 2013 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "Karma.h"
 
-Karma::Karma(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld)
+namespace Deeangband
 {
-       Karma();
-       return;
-}
 
-Karma::Karma(void)
-{
-       this->desciplinePlus.SetPoint(0, 0, 0, 0, 0);
-       return;
-}
+       Karma::Karma(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld)
+       {
+               Karma();
+               return;
+       }
 
-Karma::~Karma(void)
-{
-       return;
-}
+       Karma::Karma(void)
+       {
+               this->desciplinePlus.SetPoint(0, 0, 0, 0, 0);
+               return;
+       }
 
-const Discipline* Karma::GetDiscipline(void)
-{
-       return &(this->desciplinePlus);
-}
+       Karma::~Karma(void)
+       {
+               return;
+       }
+
+       const Discipline* Karma::GetDiscipline(void)
+       {
+               return &(this->desciplinePlus);
+       }
 
+}
\ No newline at end of file
index 6462cec..58f4e35 100644 (file)
@@ -1,10 +1,10 @@
 /*!
- * @file Karma.h
- * @brief \83J\83\8b\83}\82Ì\83v\83\8d\83g\83^\83C\83v\90é\8c¾
- * @date 2014/02/01
- * @author Deskull
- * 2014 Sikabane Works.
- */
+* @file Karma.h
+* @brief \83J\83\8b\83}\82Ì\83v\83\8d\83g\83^\83C\83v\90é\8c¾
+* @date 2014/02/01
+* @author Deskull
+* 2014 Sikabane Works.
+*/
 
 #pragma once
 
 #include "CreatureTemplate.h"
 #include "Deeangband.h"
 
-/*! 
- * @brief \83J\83\8b\83}\82Ì\88ê\97\97\97ñ\8b\93
- */
-enum KARMA_TYPE
+namespace Deeangband
 {
-       KARMA_IDEAL,       //!< \83J\83\8b\83}:\97\9d\91z
-       KARMA_PRAGMATIC,   //!< \83J\83\8b\83}:\8eÀ\97\98
-       KARMA_HARMONY,     //!< \83J\83\8b\83}:\92²\98a
-       KARMA_ALOOFNESS,   //!< \83J\83\8b\83}:\8cÇ\8d\82
-       KARMA_TEMPERATE,   //!< \83J\83\8b\83}:\90ß\90§
-       KARMA_INDULGENT,   //!< \83J\83\8b\83}:\96z\95ú
-       KARMA_CHASTE,      //!< \83J\83\8b\83}:\92å\90ß
-       KARMA_PASSION,     //!< \83J\83\8b\83}:\8fî\97~
-       KARMA_MERCY,       //!< \83J\83\8b\83}:\8e\9c\94ß
-       KARMA_CRUELTY,     //!< \83J\83\8b\83}:\97â\8d\93
-       KARMA_HONEST,      //!< \83J\83\8b\83}:\90½\8eÀ
-       KARMA_CLEVER,      //!< \83J\83\8b\83}:àÂàÏ
-       KARMA_FORGIVING,   //!< \83J\83\8b\83}:\8a°\91å
-       KARMA_AVENGE,      //!< \83J\83\8b\83}:\8e·\94O
-       KARMA_GENEROUS,    //!< \83J\83\8b\83}:\9c\97\92W
-       KARMA_GREED,       //!< \83J\83\8b\83}:æÃ\97~
-       KARMA_MODEST,      //!< \83J\83\8b\83}:\8cª\8b\95
-       KARMA_PROUD,       //!< \83J\83\8b\83}:\98ü\96\9d
-       KARMA_TRSUTING,    //!< \83J\83\8b\83}:\8f\83\96p
-       KARMA_SUSPICION,   //!< \83J\83\8b\83}:àÈ\8b^
-       KARMA_ZEALOTRY,    //!< \83J\83\8b\83}:\94M\90S
-       KARMA_SCEPTICISM,  //!< \83J\83\8b\83}:\89ù\8b^
-       KARMA_DELIGENT,    //!< \83J\83\8b\83}:\8bÎ\95×
-       KARMA_IDLENESS,    //!< \83J\83\8b\83}:\96³\88×
-       KARMA_CREATION,    //!< \83J\83\8b\83}:\91n\91¢
-       KARMA_DESTRUCTION, //!< \83J\83\8b\83}:\94j\89ó
-       KARMA_PLEASURE,    //!< \83J\83\8b\83}:\89õ\8ay
-       KARMA_PAIN,        //!< \83J\83\8b\83}:\8bê\92É
-       KARMA_WEALTH,      //!< \83J\83\8b\83}:\95x\97T
-       KARMA_PRESITIGE,   //!< \83J\83\8b\83}:\91¸\8cµ
-       KARMA_ERUDITION,   //!< \83J\83\8b\83}:\94\8e\8e¯
-       KARMA_BRAVE,       //!< \83J\83\8b\83}:\97E\96Ò
-       KARMA_DISCRETION,  //!< \83J\83\8b\83}:\8ev\97
-       KARMA_FORTUNE,     //!< \83J\83\8b\83}:\93V\89^
-       MAX_KARMAS,        //!< \83J\83\8b\83}\90\94
-};
 
-/*! 
- * @class Karma
- * @brief \83J\83\8b\83}\82Ì\83N\83\89\83X
- */
-class Karma : public CreatureTemplate
-{
-private:
-       Discipline desciplinePlus; //!< \8fC\97{\92l\8fC\90³
+       /*! 
+       * @brief \83J\83\8b\83}\82Ì\88ê\97\97\97ñ\8b\93
+       */
+       enum KARMA_TYPE
+       {
+               KARMA_IDEAL,       //!< \83J\83\8b\83}:\97\9d\91z
+               KARMA_PRAGMATIC,   //!< \83J\83\8b\83}:\8eÀ\97\98
+               KARMA_HARMONY,     //!< \83J\83\8b\83}:\92²\98a
+               KARMA_ALOOFNESS,   //!< \83J\83\8b\83}:\8cÇ\8d\82
+               KARMA_TEMPERATE,   //!< \83J\83\8b\83}:\90ß\90§
+               KARMA_INDULGENT,   //!< \83J\83\8b\83}:\96z\95ú
+               KARMA_CHASTE,      //!< \83J\83\8b\83}:\92å\90ß
+               KARMA_PASSION,     //!< \83J\83\8b\83}:\8fî\97~
+               KARMA_MERCY,       //!< \83J\83\8b\83}:\8e\9c\94ß
+               KARMA_CRUELTY,     //!< \83J\83\8b\83}:\97â\8d\93
+               KARMA_HONEST,      //!< \83J\83\8b\83}:\90½\8eÀ
+               KARMA_CLEVER,      //!< \83J\83\8b\83}:àÂàÏ
+               KARMA_FORGIVING,   //!< \83J\83\8b\83}:\8a°\91å
+               KARMA_AVENGE,      //!< \83J\83\8b\83}:\8e·\94O
+               KARMA_GENEROUS,    //!< \83J\83\8b\83}:\9c\97\92W
+               KARMA_GREED,       //!< \83J\83\8b\83}:æÃ\97~
+               KARMA_MODEST,      //!< \83J\83\8b\83}:\8cª\8b\95
+               KARMA_PROUD,       //!< \83J\83\8b\83}:\98ü\96\9d
+               KARMA_TRSUTING,    //!< \83J\83\8b\83}:\8f\83\96p
+               KARMA_SUSPICION,   //!< \83J\83\8b\83}:àÈ\8b^
+               KARMA_ZEALOTRY,    //!< \83J\83\8b\83}:\94M\90S
+               KARMA_SCEPTICISM,  //!< \83J\83\8b\83}:\89ù\8b^
+               KARMA_DELIGENT,    //!< \83J\83\8b\83}:\8bÎ\95×
+               KARMA_IDLENESS,    //!< \83J\83\8b\83}:\96³\88×
+               KARMA_CREATION,    //!< \83J\83\8b\83}:\91n\91¢
+               KARMA_DESTRUCTION, //!< \83J\83\8b\83}:\94j\89ó
+               KARMA_PLEASURE,    //!< \83J\83\8b\83}:\89õ\8ay
+               KARMA_PAIN,        //!< \83J\83\8b\83}:\8bê\92É
+               KARMA_WEALTH,      //!< \83J\83\8b\83}:\95x\97T
+               KARMA_PRESITIGE,   //!< \83J\83\8b\83}:\91¸\8cµ
+               KARMA_ERUDITION,   //!< \83J\83\8b\83}:\94\8e\8e¯
+               KARMA_BRAVE,       //!< \83J\83\8b\83}:\97E\96Ò
+               KARMA_DISCRETION,  //!< \83J\83\8b\83}:\8ev\97
+               KARMA_FORTUNE,     //!< \83J\83\8b\83}:\93V\89^
+               MAX_KARMAS,        //!< \83J\83\8b\83}\90\94
+       };
 
-       /*!
-        * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\89»\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 fileVersion \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 fileVersion) 
+       /*! 
+       * @class Karma
+       * @brief \83J\83\8b\83}\82Ì\83N\83\89\83X
+       */
+       class Karma : public CreatureTemplate
        {
-               archive & BOOST_SERIALIZATION_NVP(desciplinePlus);
-       }
+       private:
+               Discipline desciplinePlus; //!< \8fC\97{\92l\8fC\90³
 
-public:
+               /*!
+               * @brief \83N\83\89\83X\82Ì\83V\83\8a\83A\83\89\83C\83Y\89»\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 fileVersion \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 fileVersion) 
+               {
+                       archive & BOOST_SERIALIZATION_NVP(desciplinePlus);
+               }
 
-       /*! 
-        * @brief Karma\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^
-        */
-       Karma::Karma(ID id, TAG tag, GameWorld *gameWorld);
+       public:
 
-       /*! 
-        * @brief Karma\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(\8f\89\8aú\92l\91ã\93ü)
-        */
-       Karma::Karma(void);
+               /*! 
+               * @brief Karma\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^
+               */
+               Karma::Karma(ID id, TAG tag, GameWorld *gameWorld);
 
-       /*! 
-        * @brief Karma\83N\83\89\83X\83f\83X\83g\83\89\83N\83^
-        */
-       Karma::~Karma(void);
+               /*! 
+               * @brief Karma\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(\8f\89\8aú\92l\91ã\93ü)
+               */
+               Karma::Karma(void);
 
-       /*! 
-        * @brief \8fC\97{\92l\8fC\90³\82ð\95Ô\82·
-        * @return \8fC\97{\92l\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
-        */
-       const Discipline* Karma::GetDiscipline(void);
-};
+               /*! 
+               * @brief Karma\83N\83\89\83X\83f\83X\83g\83\89\83N\83^
+               */
+               Karma::~Karma(void);
+
+               /*! 
+               * @brief \8fC\97{\92l\8fC\90³\82ð\95Ô\82·
+               * @return \8fC\97{\92l\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
+               */
+               const Discipline* Karma::GetDiscipline(void);
+       };
+
+}
\ No newline at end of file
index 0bbae8d..3f22033 100644 (file)
@@ -1,25 +1,30 @@
 /*!
- * @file Trap.cpp
- * @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\82ð\92è\8b`\82·\82é
- * @date 2014/01/26
- * @author Deskull
- * 2014 Sikabane Works.
- */
+* @file Trap.cpp
+* @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\82ð\92è\8b`\82·\82é
+* @date 2014/01/26
+* @author Deskull
+* 2014 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "Trap.h"
 
-Trap::Trap(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+namespace Deeangband
 {
-       return;
-}
 
-Trap::Trap(void)
-{
-       return;
-}
+       Trap::Trap(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       {
+               return;
+       }
 
-Trap::~Trap(void)
-{
-       return;
-}
+       Trap::Trap(void)
+       {
+               return;
+       }
+
+       Trap::~Trap(void)
+       {
+               return;
+       }
+
+}
\ No newline at end of file
index 645dbe5..ef4fc32 100644 (file)
@@ -1,45 +1,50 @@
 /*!
- * @file Trap.h
- * @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\82Ì\83v\83\8d\83g\83^\83C\83v
- * @date 2014/01/26
- * @author Deskull
- * 2014 Sikabane Works.
- */
+* @file Trap.h
+* @brief \83Q\81[\83\80\92\86\82Ì\83g\83\89\83b\83v\82Ì\83v\83\8d\83g\83^\83C\83v
+* @date 2014/01/26
+* @author Deskull
+* 2014 Sikabane Works.
+*/
 
 #include "stdafx.h"
 #include "Coordinates.h"
 #include "GameElement.h"
 
-/*! 
- * @class Trap
- * @brief \83g\83\89\83b\83v\82Ì\83N\83\89\83X
- */
-class Trap : public GameElement
+namespace Deeangband
 {
-private:
 
-       ID floorID; //!<\8f\8a\8dÝ\83t\83\8d\83AID
-       Coordinates position; //!<\8f\8a\8dÝ\8dÀ\95W
-
-       friend class boost::serialization::access;
-       template<class Archive> void serialize(Archive &archive, const unsigned int) 
+       /*! 
+       * @class Trap
+       * @brief \83g\83\89\83b\83v\82Ì\83N\83\89\83X
+       */
+       class Trap : public GameElement
        {
-               archive & BOOST_SERIALIZATION_NVP(floorID);
-               archive & BOOST_SERIALIZATION_NVP(position);
-       }
+       private:
 
-public:
+               ID floorID; //!<\8f\8a\8dÝ\83t\83\8d\83AID
+               Coordinates position; //!<\8f\8a\8dÝ\8dÀ\95W
 
-       /*! 
-        * @brief Trap\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^
-        */
-       Trap::Trap(ID id, TAG tag, GameWorld *gameWorld);
+               friend class boost::serialization::access;
+               template<class Archive> void serialize(Archive &archive, const unsigned int) 
+               {
+                       archive & BOOST_SERIALIZATION_NVP(floorID);
+                       archive & BOOST_SERIALIZATION_NVP(position);
+               }
+
+       public:
+
+               /*! 
+               * @brief Trap\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^
+               */
+               Trap::Trap(ID id, TAG tag, GameWorld *gameWorld);
+
+               Trap::Trap(void);
 
-       Trap::Trap(void);
+               Trap::~Trap(void);
 
-       Trap::~Trap(void);
+       };
 
-};
\ No newline at end of file
+}
\ No newline at end of file