Change Dungeon::GetOuterWallFeatureID() to Dungeon::GetOuterWallFeatureTag(), Dungeon...

diff --git a/Deeangband/Dungeon.cpp b/Deeangband/Dungeon.cpp
index 58d867a..0630d5d 100644 (file)
--- a/Deeangband/Dungeon.cpp
+++ b/Deeangband/Dungeon.cpp
@@ -42,4 +42,14 @@ namespace Deeangband
                return true;
        }
 
+       TAG Dungeon::GetOuterWallFeatureTag(void)
+       {
+               return this->innerWallFeature;
+       }
+
+       TAG Dungeon::GetInnerWallFeatureTag(void)
+       {
+               return this->outerWallFeature;
+       }
+
 }
\ No newline at end of file

diff --git a/Deeangband/Dungeon.h b/Deeangband/Dungeon.h
index e7e8a69..9adfcf8 100644 (file)
--- a/Deeangband/Dungeon.h
+++ b/Deeangband/Dungeon.h
@@ -125,9 +125,9 @@ namespace Deeangband
 
                /*!
                * @brief \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8aO\95Ç\92n\8c`\82ð\95Ô\82·
-               * @return \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8aO\95Ç\92n\8c`ID
+               * @return \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8aO\95Ç\92n\8c`\83^\83O
                */
-               ID Dungeon::GetOuterWallFeatureID(void);
+               TAG Dungeon::GetOuterWallFeatureTag(void);
 
                /*!
                * @brief \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\8aO\95Ç\92n\8c`\82ð\95Ô\82·
@@ -137,9 +137,9 @@ namespace Deeangband
 
                /*!
                * @brief \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\93à\95Ç\92n\8c`\82ð\95Ô\82·
-               * @return \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\93à\95Ç\92n\8c`\8eQ\8fÆID
+               * @return \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\93à\95Ç\92n\8c`\8eQ\8fÆ\83^\83O
                */
-               ID Dungeon::GetInnerWallFeatureID(void);
+               TAG Dungeon::GetInnerWallFeatureTag(void);
 
                /*!
                * @brief \83_\83\93\83W\83\87\83\93\82Ì\8aî\96{\93à\95Ç\92n\8c`\82ð\95Ô\82·

diff --git a/Deeangband/Floor.cpp b/Deeangband/Floor.cpp
index b03c3f6..70da51d 100644 (file)
--- a/Deeangband/Floor.cpp
+++ b/Deeangband/Floor.cpp
@@ -33,6 +33,21 @@ namespace Deeangband
 
        Floor::Floor(ID id, TAG tag, GameWorld *gameWorld, Dungeon *dungeonPtr, DEPTH depth) : GameElement(id, tag, gameWorld)
        {
+               int x, y;
+               this->width = 50;
+               this->height = 50;
+
+               squares.resize(this->height);
+               for(y = 0; y < height; y++)
+               {
+                       for(x = 0; x < width; x++)
+                       {
+                               squares[y].push_back(boost::shared_ptr<Square>(new Square()));
+                               squares[y][x]->SetFeatureTag("VANILLA_PERMANET_WALL");
+                       }
+               }
+
+               doors.resize(0);
        }
 
        Floor::Floor()

diff --git a/lib-Vanilla/Dungeon.xml b/lib-Vanilla/Dungeon.xml
index 0596485..4b2abce 100644 (file)
--- a/lib-Vanilla/Dungeon.xml
+++ b/lib-Vanilla/Dungeon.xml
@@ -5,14 +5,14 @@
        <count>1</count>
        <item_version>0</item_version>
        <item class_id="1" tracking_level="0" version="0">
-               <first>XXX_UNKNOWN</first>
+               <first>VANILLA_WOMB</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="10" object_id="_0">
-                               <Name>UNKNOWN</Name>
+                               <Name>à\80\88ó\82Ì\91Ù</Name>
                                <MinDepth>1</MinDepth>
                                <MaxDepth>50</MaxDepth>
-                               <OuterWallFeature>XXX_UNKNOWN</OuterWallFeature>
-                               <InnerWallFeature>XXX_UNKNOWN</InnerWallFeature>
+                               <OuterWallFeature>VANILLA_PERMANENT_WALL</OuterWallFeature>
+                               <InnerWallFeature>VANILLA_PERMANENT_WALL</InnerWallFeature>
                                <ControllCamp></ControllCamp>
                                <GuardianSpecies></GuardianSpecies>
                        </px>