Add XML element to Feature class.

diff --git a/Deeangband/Feature.h b/Deeangband/Feature.h
index 1824ddc..6d829e8 100644 (file)
--- a/Deeangband/Feature.h
+++ b/Deeangband/Feature.h
@@ -22,7 +22,6 @@ namespace Deeangband
        class Feature : public GameElement
        {
        private:
-               std::string name; /*!< \92n\8c`\82Ì\96¼\91O */
                ID tileID; /*!< \92n\8c`\83^\83C\83\8bID */
                char symbol; /*!< \92n\8c`\83^\83C\83\8b\83V\83\93\83{\83\8b */
                Color symColor; /*!< \92n\8c`\83V\83\93\83{\83\8b\83J\83\89\81[ */
@@ -42,9 +41,9 @@ namespace Deeangband
                        {
                                archive & BOOST_SERIALIZATION_NVP(name);
                                archive & BOOST_SERIALIZATION_NVP(tileID);
-                               //archive & BOOST_SERIALIZATION_NVP(symbol);
-                               //archive & BOOST_SERIALIZATION_NVP(symColor);
-                               //archive & BOOST_SERIALIZATION_NVP(backColor);
+                               archive & BOOST_SERIALIZATION_NVP(symbol);
+                               archive & BOOST_SERIALIZATION_NVP(symColor);
+                               archive & BOOST_SERIALIZATION_NVP(backColor);
                        }
                }
 
@@ -100,4 +99,6 @@ namespace Deeangband
 
        };
 
-}
\ No newline at end of file
+}
+
+BOOST_CLASS_VERSION(Deeangband::Feature, 10);

diff --git a/lib-Vanilla/Feature.xml b/lib-Vanilla/Feature.xml
index dbcd18a..53b9f94 100644 (file)
--- a/lib-Vanilla/Feature.xml
+++ b/lib-Vanilla/Feature.xml
@@ -5,29 +5,68 @@
        <count>3</count>
        <item_version>0</item_version>
        <item class_id="1" tracking_level="0" version="0">
-               <first>XXX_UNKNOWN</first>
+               <first>VANILLA_PERMANET_FLOOR</first>
                <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
+                       <px class_id="3" tracking_level="1" version="10" object_id="_0">
+                               <name>\89i\8bv\8f°</name>
                                <tileID>-1</tileID>
+                               <symbol>88</symbol>
+                               <symColor class_id="4" tracking_level="0" version="10">
+                                       <Red>40</Red>
+                                       <Green>40</Green>
+                                       <Blue>40</Blue>
+                                       <Alpha>255</Alpha>
+                               </symColor>
+                               <backColor>
+                                       <Red>0</Red>
+                                       <Green>0</Green>
+                                       <Blue>0</Blue>
+                                       <Alpha>255</Alpha>
+                               </backColor>
                        </px>
                </second>
        </item>
-       <item class_id="1" tracking_level="0" version="0">
+       <item>
                <first>VANILLA_PERMANET_WALL</first>
-               <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_1">
+               <second>
+                       <px class_id_reference="3" object_id="_1">
                                <name>\89i\8bv\95Ç</name>
                                <tileID>-1</tileID>
+                               <symbol>88</symbol>
+                               <symColor>
+                                       <Red>40</Red>
+                                       <Green>40</Green>
+                                       <Blue>40</Blue>
+                                       <Alpha>255</Alpha>
+                               </symColor>
+                               <backColor>
+                                       <Red>0</Red>
+                                       <Green>0</Green>
+                                       <Blue>0</Blue>
+                                       <Alpha>255</Alpha>
+                               </backColor>
                        </px>
                </second>
        </item>
-       <item class_id="1" tracking_level="0" version="0">
-               <first>VANILLA_PERMANET_FLOOR</first>
-               <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_2">
-                               <name>\89i\8bv\8f°</name>
+       <item>
+               <first>XXX_UNKNOWN</first>
+               <second>
+                       <px class_id_reference="3" object_id="_2">
+                               <name>\96¢\92m\82Ì\92n\8c`</name>
                                <tileID>-1</tileID>
+                               <symbol>88</symbol>
+                               <symColor>
+                                       <Red>40</Red>
+                                       <Green>40</Green>
+                                       <Blue>40</Blue>
+                                       <Alpha>255</Alpha>
+                               </symColor>
+                               <backColor>
+                                       <Red>0</Red>
+                                       <Green>0</Green>
+                                       <Blue>0</Blue>
+                                       <Alpha>255</Alpha>
+                               </backColor>
                        </px>
                </second>
        </item>