Re-fix naming in Dungeon class.

diff --git a/Deeangband/Dungeon.cpp b/Deeangband/Dungeon.cpp
index 3dd793b..4a9c26f 100644 (file)
--- a/Deeangband/Dungeon.cpp
+++ b/Deeangband/Dungeon.cpp
@@ -47,9 +47,9 @@ namespace Deeangband
                return this->outerWallFeature;
        }
 
-       TAG Dungeon::GetFieldFeatureTag(void)
+       TAG Dungeon::GetFloorFeatureTag(void)
        {
-               return this->fieldFeature;
+               return this->floorFeature;
        }
 
        Coordinates Dungeon::GetBaseSize(void)

diff --git a/Deeangband/Dungeon.h b/Deeangband/Dungeon.h
index 9fbe8a3..b11d875 100644 (file)
--- a/Deeangband/Dungeon.h
+++ b/Deeangband/Dungeon.h
@@ -64,7 +64,7 @@ namespace Deeangband
                DEPTH maxDepth;       //!< \8dÅ\90[\8aK\91w
                TAG outerWallFeature; //!< \8aî\96{\8aO\95Ç\92n\8c`\83^\83O
                TAG innerWallFeature; //!< \8aî\96{\93à\95Ç\92n\8c`\83^\83O
-               TAG fieldFeature;     //!< \8aî\96{\8f°\92n\8c`\83^\83O
+               TAG floorFeature;     //!< \8aî\96{\8f°\92n\8c`\83^\83O
                TAG controlCamp;      //!< \8f\8a\97L\90w\89c\83^\83O
                TAG guardianSpecies;  //!< \83_\83\93\83W\83\87\83\93\82Ì\8eç\8cì\8eÒ\83^\83O
                Coordinates baseSize; //!< \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\83T\83C\83Y
@@ -87,7 +87,7 @@ namespace Deeangband
                                archive & boost::serialization::make_nvp("MaxDepth", maxDepth);
                                archive & boost::serialization::make_nvp("OuterWallFeature", outerWallFeature);
                                archive & boost::serialization::make_nvp("InnerWallFeature", innerWallFeature);
-                               archive & boost::serialization::make_nvp("FieldFeature", fieldFeature);
+                               archive & boost::serialization::make_nvp("FloorFeature", floorFeature);
                                archive & boost::serialization::make_nvp("ControllCamp", controlCamp);
                                archive & boost::serialization::make_nvp("GuardianSpecies", guardianSpecies);
                                archive & boost::serialization::make_nvp("BaseSize", baseSize);
@@ -153,7 +153,7 @@ namespace Deeangband
                * @brief \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8f°\92n\8c`\82ð\95Ô\82·
                * @return \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8f°\92n\8c`\8eQ\8fÆ\83^\83O
                */
-               TAG Dungeon::GetFieldFeatureTag(void);
+               TAG Dungeon::GetFloorFeatureTag(void);
 
                /*!
                * @brief \83_\83\93\83W\83\87\83\93\82ð\8f\8a\97L\82·\82é\90w\89c\82ð\95Ô\82·

diff --git a/Deeangband/Field.cpp b/Deeangband/Field.cpp
index dd4b2af..a02a2b3 100644 (file)
--- a/Deeangband/Field.cpp
+++ b/Deeangband/Field.cpp
@@ -30,7 +30,7 @@ namespace Deeangband
                        {
                                squares[y].push_back(boost::shared_ptr<Square>(new Square()));
                                if(Dice::Cast(1, 2) == 2) squares[y][x]->SetFeatureTag(dungeonPtr->GetInnerWallFeatureTag());
-                               else squares[y][x]->SetFeatureTag(dungeonPtr->GetFieldFeatureTag());
+                               else squares[y][x]->SetFeatureTag(dungeonPtr->GetFloorFeatureTag());
                        }
                }
 

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index cabc892..370f108 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -15,12 +15,18 @@ namespace Deeangband
 
        GameWorld::GameWorld(void)
        {
+               int i;
                Dice::Initialize();
                XMLLoad();
                //startingClassList.emplace("AAA", boost::make_shared<StartingClass>());
                fieldList.emplace(0, boost::make_shared<Field>(dungeonList.find("VANILLA_WOMB"), 1));
                creatureList.emplace(0, boost::make_shared<Creature>(speciesList.find("VANILLA_STIGMATIC")));
 
+               for(i = 0; i < MAX_KARMAS; i++)
+               {
+                       karmaList.emplace("VANILLA_", boost::make_shared<Karma>());
+               }
+
                playerPtr = &(*creatureList[0]);
        }
 

diff --git a/Deeangband/Karma.h b/Deeangband/Karma.h
index bc9d1c6..6fee3a1 100644 (file)
--- a/Deeangband/Karma.h
+++ b/Deeangband/Karma.h
@@ -21,40 +21,40 @@ namespace Deeangband
        */
        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^
+               VANILLA_IDEAL,       //!< \83J\83\8b\83}:\97\9d\91z
+               VANILLA_PRAGMATIC,   //!< \83J\83\8b\83}:\8eÀ\97\98
+               VANILLA_HARMONY,     //!< \83J\83\8b\83}:\92²\98a
+               VANILLA_ALOOFNESS,   //!< \83J\83\8b\83}:\8cÇ\8d\82
+               VANILLA_TEMPERATE,   //!< \83J\83\8b\83}:\90ß\90§
+               VANILLA_INDULGENT,   //!< \83J\83\8b\83}:\96z\95ú
+               VANILLA_CHASTE,      //!< \83J\83\8b\83}:\92å\90ß
+               VANILLA_PASSION,     //!< \83J\83\8b\83}:\8fî\97~
+               VANILLA_MERCY,       //!< \83J\83\8b\83}:\8e\9c\94ß
+               VANILLA_CRUELTY,     //!< \83J\83\8b\83}:\97â\8d\93
+               VANILLA_HONEST,      //!< \83J\83\8b\83}:\90½\8eÀ
+               VANILLA_CLEVER,      //!< \83J\83\8b\83}:àÂàÏ
+               VANILLA_FORGIVING,   //!< \83J\83\8b\83}:\8a°\91å
+               VANILLA_AVENGE,      //!< \83J\83\8b\83}:\8e·\94O
+               VANILLA_GENEROUS,    //!< \83J\83\8b\83}:\9c\97\92W
+               VANILLA_GREED,       //!< \83J\83\8b\83}:æÃ\97~
+               VANILLA_MODEST,      //!< \83J\83\8b\83}:\8cª\8b\95
+               VANILLA_PROUD,       //!< \83J\83\8b\83}:\98ü\96\9d
+               VANILLA_TRSUTING,    //!< \83J\83\8b\83}:\8f\83\96p
+               VANILLA_SUSPICION,   //!< \83J\83\8b\83}:àÈ\8b^
+               VANILLA_ZEALOTRY,    //!< \83J\83\8b\83}:\94M\90S
+               VANILLA_SCEPTICISM,  //!< \83J\83\8b\83}:\89ù\8b^
+               VANILLA_DELIGENT,    //!< \83J\83\8b\83}:\8bÎ\95×
+               VANILLA_IDLENESS,    //!< \83J\83\8b\83}:\96³\88×
+               VANILLA_CREATION,    //!< \83J\83\8b\83}:\91n\91¢
+               VANILLA_DESTRUCTION, //!< \83J\83\8b\83}:\94j\89ó
+               VANILLA_PLEASURE,    //!< \83J\83\8b\83}:\89õ\8ay
+               VANILLA_PAIN,        //!< \83J\83\8b\83}:\8bê\92É
+               VANILLA_WEALTH,      //!< \83J\83\8b\83}:\95x\97T
+               VANILLA_PRESITIGE,   //!< \83J\83\8b\83}:\91¸\8cµ
+               VANILLA_ERUDITION,   //!< \83J\83\8b\83}:\94\8e\8e¯
+               VANILLA_BRAVE,       //!< \83J\83\8b\83}:\97E\96Ò
+               VANILLA_DISCRETION,  //!< \83J\83\8b\83}:\8ev\97¶
+               VANILLA_FORTUNE,     //!< \83J\83\8b\83}:\93V\89^
                MAX_KARMAS,        //!< \83J\83\8b\83}\90\94
        };
 

diff --git a/lib-Vanilla/Dungeon.xml b/lib-Vanilla/Dungeon.xml
index 16f93a4..729180d 100644 (file)
--- a/lib-Vanilla/Dungeon.xml
+++ b/lib-Vanilla/Dungeon.xml
@@ -14,7 +14,7 @@
                                <MaxDepth>50</MaxDepth>
                                <OuterWallFeature>VANILLA_PERMANENT_WALL</OuterWallFeature>
                                <InnerWallFeature>VANILLA_PERMANENT_WALL</InnerWallFeature>
-                               <FieldFeature>VANILLA_PERMANENT_Field</FieldFeature>
+                               <FloorFeature>VANILLA_PERMANENT_FLOOR</FloorFeature>
                                <ControllCamp></ControllCamp>
                                <GuardianSpecies></GuardianSpecies>
                                <BaseSize class_id="4" tracking_level="0" version="10">