FixedFloor class becomes a subclass of Floor class.

diff --git a/Deeangband/FixedFloor.cpp b/Deeangband/FixedFloor.cpp
index 45e09db..782cb0b 100644 (file)
--- a/Deeangband/FixedFloor.cpp
+++ b/Deeangband/FixedFloor.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       FixedFloor::FixedFloor(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       FixedFloor::FixedFloor(ID id, TAG tag, GameWorld *gameWorld) : Floor(id, tag, gameWorld)
        {
        }
 

diff --git a/Deeangband/FixedFloor.h b/Deeangband/FixedFloor.h
index 608731e..b184e10 100644 (file)
--- a/Deeangband/FixedFloor.h
+++ b/Deeangband/FixedFloor.h
@@ -7,7 +7,7 @@
 */
 
 #include "stdafx.h"
-#include "GameElement.h"
+#include "Floor.h"
 
 namespace Deeangband
 {
@@ -16,7 +16,7 @@ namespace Deeangband
        * @class FixedFloor
        * @brief \8cÅ\92è\83t\83\8d\83A\82Ì\83N\83\89\83X
        */
-       class FixedFloor : public GameElement
+       class FixedFloor : public Floor
        {
        private:
 
@@ -32,7 +32,7 @@ namespace Deeangband
                */
                template<class Archive> void serialize(Archive &archive, const unsigned int fileVersion) 
                {
-                       archive & BOOST_SERIALIZATION_NVP(name);
+                       archive & boost::serialization::make_nvp("Name", name);
                }
 
        public: