[Modify] boostライブラリに依存した処理をコメントアウトによる一時的措置を含めて完了．

diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp
index 8b35274..2eab22e 100644 (file)
--- a/Deeangband/Creature.cpp
+++ b/Deeangband/Creature.cpp
@@ -448,8 +448,8 @@ namespace Deeangband
        {
                std::ofstream ofs(filename);
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Creature", *this);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Creature", *this);
        }
 
        bool Creature::InSight(MAP_LENGTH x, MAP_LENGTH y)

diff --git a/Deeangband/Field.cpp b/Deeangband/Field.cpp
index b5fda23..422e030 100644 (file)
--- a/Deeangband/Field.cpp
+++ b/Deeangband/Field.cpp
@@ -110,7 +110,7 @@ namespace Deeangband
 
        bool Field::GenerateTrap(std::map<TAG, std::shared_ptr<TrapBase>>::iterator trapBaseIt, Coordinates *position)
        {
-               traps.emplace(traps.end(), boost::make_shared<Trap>(trapBaseIt, position));
+               traps.emplace(traps.end(), std::make_shared<Trap>(trapBaseIt, position));
                return true;
        }
 
@@ -231,8 +231,8 @@ namespace Deeangband
                        squarePtr->SetFloor(dungeonPtr->GetInnerWallFloorTag());
                        squarePtr = this->GetSquare(ex, y);
                        squarePtr->SetFloor(dungeonPtr->GetInnerWallFloorTag());
-                       wallVec.push_back(boost::make_shared<Coordinates>(sx, y));
-                       wallVec.push_back(boost::make_shared<Coordinates>(ex, y));
+                       wallVec.push_back(std::make_shared<Coordinates>(sx, y));
+                       wallVec.push_back(std::make_shared<Coordinates>(ex, y));
                }
 
                for(x = sx + 1; x < ex; x++)
@@ -241,8 +241,8 @@ namespace Deeangband
                        squarePtr->SetFloor(dungeonPtr->GetInnerWallFloorTag());
                        squarePtr = this->GetSquare(x, ey);
                        squarePtr->SetFloor(dungeonPtr->GetInnerWallFloorTag());
-                       wallVec.push_back(boost::make_shared<Coordinates>(x, sy));
-                       wallVec.push_back(boost::make_shared<Coordinates>(x, ey));
+                       wallVec.push_back(std::make_shared<Coordinates>(x, sy));
+                       wallVec.push_back(std::make_shared<Coordinates>(x, ey));
                }
 
                this->GetSquare(*wallVec[Dice::Rand0(wallVec.size())].get())->SetFloor(dungeonPtr->GetFloorFloorTag());

diff --git a/Deeangband/GameEngine.cpp b/Deeangband/GameEngine.cpp
index 3dbe853..c4b6bce 100644 (file)
--- a/Deeangband/GameEngine.cpp
+++ b/Deeangband/GameEngine.cpp
@@ -15,10 +15,11 @@
 #include "Creature.h"
 #include "GameCampaign.h"
 #include "GameLogger.h"
+#include <thread>
 
 namespace Deeangband
 {
-       boost::mutex mutex;
+       std::mutex mutex;
 
        GameEngine::GameEngine()
        {
@@ -61,8 +62,8 @@ namespace Deeangband
 
        PLAY_EXIT_CODE GameEngine::PlayLoop(void)
        {
-               boost::asio::io_service io;
-               boost::thread drawing(&GameEngine::DrawingLoop, this);
+               //std::asio::io_service io;
+               std::thread drawing(&GameEngine::DrawingLoop, this);
                drawing.detach();
 
                GAME_COMMAND commandID;

diff --git a/Deeangband/GameEngine.h b/Deeangband/GameEngine.h
index 186ddd1..002fbde 100644 (file)
--- a/Deeangband/GameEngine.h
+++ b/Deeangband/GameEngine.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "stdafx.h"
+#include <mutex>
 #include "Deeangband.h"
 
 #include "Coordinates.h"
@@ -31,7 +32,7 @@ namespace Deeangband
                GameWorld *gameWorld; //!< GameWorld\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
                GameSurface *gameSurface; //!< GameSurface\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
                GameLogger *gameLogger; //!< GameLogger\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
-               boost::mutex mutex;
+               std::mutex mutex;
 
 
        public:

diff --git a/Deeangband/GameLogger.cpp b/Deeangband/GameLogger.cpp
index a816f51..c4e26aa 100644 (file)
--- a/Deeangband/GameLogger.cpp
+++ b/Deeangband/GameLogger.cpp
@@ -8,6 +8,7 @@
 
 #include "stdafx.h"
 #include "GameLogger.h"
+#include <iomanip>
 
 namespace Deeangband
 {
@@ -45,12 +46,12 @@ namespace Deeangband
 
        void GameLogger::CreatureMoved(ID creatureID, NAME name, DIRECTION dir)
        {
-               GameLogger::PutLog((boost::format("[%1%]%2%\82ª\95û\8cü%3%\82É\88Ú\93®") % creatureID % name.c_str() % dir).str());
+               //GameLogger::PutLog((boost::format("[%1%]%2%\82ª\95û\8cü%3%\82É\88Ú\93®") % creatureID % name.c_str() % dir).str());
        }
 
        void GameLogger::CreaturesCombated(NAME attackerName, NAME targetName)
        {
-               GameLogger::PutLog((boost::format("%1%\82ª%2%\82Ö\82Ì\94\92\95º\90í\82É\88Ú\8ds") % attackerName.c_str() % targetName.c_str()).str());
+               //GameLogger::PutLog((boost::format("%1%\82ª%2%\82Ö\82Ì\94\92\95º\90í\82É\88Ú\8ds") % attackerName.c_str() % targetName.c_str()).str());
        }
 
 }
\ No newline at end of file

diff --git a/Deeangband/GameLogger.h b/Deeangband/GameLogger.h
index 17a2100..f54cea8 100644 (file)
--- a/Deeangband/GameLogger.h
+++ b/Deeangband/GameLogger.h
@@ -61,7 +61,7 @@ namespace Deeangband
                 */
                void GameLogger::CreaturesCombated(NAME attackerName, NAME targetName);
 
-               //this->gameMessages.emplace_back(boost::make_shared<GameMessage>(message, type));
+               //this->gameMessages.emplace_back(std::make_shared<GameMessage>(message, type));
 
        };
 }
\ No newline at end of file

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index 3080df6..0fa0e50 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -66,7 +66,7 @@ namespace Deeangband
                int i;
                std::map<ID, std::shared_ptr<Field>>::iterator fieldIt;
                std::map<TAG, std::shared_ptr<Species>>::iterator speciesIt;
-               fieldList.emplace(0, boost::make_shared<Field>(dungeonList.find("VANILLA_WOMB"), 1));
+               fieldList.emplace(0, std::make_shared<Field>(dungeonList.find("VANILLA_WOMB"), 1));
                fieldIt = fieldList.find(0);
 
                speciesIt = speciesList.find("VANILLA_STIGMATIC");
@@ -77,7 +77,7 @@ namespace Deeangband
 
                for(i = 0; i < MAX_KARMAS; i++)
                {
-                       karmaList.emplace("VANILLA_", boost::make_shared<Karma>());
+                       karmaList.emplace("VANILLA_", std::make_shared<Karma>());
                }
                playerIt = creatureList.begin()++;
        }
@@ -89,7 +89,7 @@ namespace Deeangband
 
        bool GameWorld::GenerateCreature(std::map<TAG, std::shared_ptr<Species>>::iterator& speciesIt)
        {
-               creatureList.emplace(this->creatureID, boost::make_shared<Creature>(speciesIt));
+               creatureList.emplace(this->creatureID, std::make_shared<Creature>(speciesIt));
                do
                {
                        this->creatureID++;
@@ -101,7 +101,7 @@ namespace Deeangband
        {
                std::map<ID, std::shared_ptr<Creature>>::iterator creatureIt;
                HaveGameTime *test;
-               creatureList.emplace(this->creatureID, boost::make_shared<Creature>(speciesIt, fieldIt, x, y));
+               creatureList.emplace(this->creatureID, std::make_shared<Creature>(speciesIt, fieldIt, x, y));
                creatureIt = creatureList.find(this->creatureID);
                creatureIt->second->PlusWait(100, TRUE);
                creatureIt->second->UpdateFieldLore();
@@ -119,8 +119,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Air.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Airs", this->airList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Airs", this->airList);
                ofs.close();
                return true;
        }
@@ -129,8 +129,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Ability.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Abilities", this->abilityList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Abilities", this->abilityList);
                ofs.close();
                return true;
        }
@@ -139,8 +139,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Authority.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Authorities", this->authorityList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Authorities", this->authorityList);
                ofs.close();
                return true;
        }
@@ -149,8 +149,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Building.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Buildings", this->buildingList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Buildings", this->buildingList);
                ofs.close();
                return true;
        }
@@ -159,8 +159,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Camp.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Camps", this->campList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Camps", this->campList);
                ofs.close();
                return true;
        }
@@ -169,8 +169,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\CreatureTrait.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("CreatureTraits", this->creatureTraitList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("CreatureTraits", this->creatureTraitList);
                ofs.close();
                return true;
        }
@@ -179,8 +179,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Dungeon.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Dungeons", this->dungeonList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Dungeons", this->dungeonList);
                ofs.close();
                return true;
        }
@@ -189,8 +189,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Effect.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Effects", this->effectList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Effects", this->effectList);
                ofs.close();
                return true;
        }
@@ -199,8 +199,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Floor.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Floors", this->floorList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Floors", this->floorList);
                ofs.close();
                return true;
        }
@@ -209,8 +209,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\FixedArtifact.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("FixedArtifacts", this->fixedArtifactList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("FixedArtifacts", this->fixedArtifactList);
                ofs.close();
                return true;
        }
@@ -219,8 +219,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\ItemBase.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemBases", this->itemBaseList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("ItemBases", this->itemBaseList);
                ofs.close();
                return true;
        }
@@ -229,8 +229,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\ItemEgo.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemEgos", this->itemEgoList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("ItemEgos", this->itemEgoList);
                ofs.close();
                return true;
        }
@@ -239,8 +239,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\ItemTrait.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemTraits", this->itemTraitList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("ItemTraits", this->itemTraitList);
                ofs.close();
                return true;
        }
@@ -249,8 +249,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Karma.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Karmas", this->karmaList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Karmas", this->karmaList);
                ofs.close();
                return true;
        }
@@ -259,8 +259,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Quest.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Quests", this->questList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Quests", this->questList);
                ofs.close();
                return true;
        }
@@ -269,8 +269,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Race.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Races", this->raceList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Races", this->raceList);
                ofs.close();
                return true;
        }
@@ -279,8 +279,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Space.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Spaces", this->spaceList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Spaces", this->spaceList);
                ofs.close();
                return true;
        }
@@ -289,8 +289,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Skill.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Skills", this->skillList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Skills", this->skillList);
                ofs.close();
                return true;
        }
@@ -299,8 +299,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\Specie.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Species", this->speciesList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("Species", this->speciesList);
                ofs.close();
                return true;
        }
@@ -309,8 +309,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\StartingClass.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("StartingClasses", this->startingClassList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("StartingClasses", this->startingClassList);
                ofs.close();
                return true;
        }
@@ -319,8 +319,8 @@ namespace Deeangband
        {
                std::ofstream ofs("lib-Vanilla\\TrapBase.xml");
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("TrapBases", this->trapBaseList);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << boost::serialization::make_nvp("TrapBases", this->trapBaseList);
                ofs.close();
                return true;
        }
@@ -355,8 +355,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Air.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(airList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(airList);
                return true;
        }
 
@@ -364,8 +364,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Ability.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(abilityList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(abilityList);
                return true;
        }
 
@@ -373,8 +373,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Authority.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(authorityList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(authorityList);
                return true;
        }
 
@@ -382,8 +382,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Building.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(buildingList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(buildingList);
                return true;
        }
 
@@ -391,8 +391,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Camp.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(campList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(campList);
                return true;
        }
 
@@ -400,8 +400,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\CreatureTrait.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(creatureTraitList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(creatureTraitList);
                return true;
        }
 
@@ -409,8 +409,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Dungeon.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(dungeonList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(dungeonList);
                return true;
        }
 
@@ -418,8 +418,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Effect.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(effectList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(effectList);
                return true;
        }
 
@@ -427,8 +427,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Floor.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(floorList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(floorList);
                return true;
        }
 
@@ -436,8 +436,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\FixedArtifact.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(fixedArtifactList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(fixedArtifactList);
                return true;
        }
 
@@ -445,8 +445,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\ItemBase.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(itemBaseList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(itemBaseList);
                return true;
        }
 
@@ -454,8 +454,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\ItemEgo.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(itemEgoList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(itemEgoList);
                return true;
        }
 
@@ -463,8 +463,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\ItemTrait.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(itemTraitList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(itemTraitList);
                return true;
        }
 
@@ -472,8 +472,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Karma.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(karmaList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(karmaList);
                return true;
        }
 
@@ -481,8 +481,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Quest.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(questList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(questList);
                return true;
        }
 
@@ -490,8 +490,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Race.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(raceList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(raceList);
                return true;
        }
 
@@ -499,8 +499,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Space.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(spaceList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(spaceList);
                return true;
        }
 
@@ -508,8 +508,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Skill.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(skillList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(skillList);
                return true;
        }
 
@@ -517,8 +517,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\Specie.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(speciesList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(speciesList);
                return true;
        }
 
@@ -526,8 +526,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\StartingClass.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(startingClassList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(startingClassList);
                return true;
        }
 
@@ -535,8 +535,8 @@ namespace Deeangband
        {
                std::ifstream ifs("lib-Vanilla\\TrapBase.xml");
                assert(ifs);
-               boost::archive::xml_iarchive ia(ifs);
-               ia >> BOOST_SERIALIZATION_NVP(trapBaseList);
+               //boost::archive::xml_iarchive ia(ifs);
+               //ia >> BOOST_SERIALIZATION_NVP(trapBaseList);
                return true;
        }
 

diff --git a/Deeangband/Item.cpp b/Deeangband/Item.cpp
index 16ed664..4b3de6a 100644 (file)
--- a/Deeangband/Item.cpp
+++ b/Deeangband/Item.cpp
@@ -59,9 +59,9 @@ void Item::XMLSave(std::string filename)
 {
        Item item = *this;
        std::ofstream ofs(filename);
-        assert(ofs);
-       boost::archive::xml_oarchive oa(ofs);
-       oa << BOOST_SERIALIZATION_NVP(item);
+       assert(ofs);
+       //boost::archive::xml_oarchive oa(ofs);
+       //oa << BOOST_SERIALIZATION_NVP(item);
 }
 
 }
\ No newline at end of file

diff --git a/Deeangband/ItemBase.cpp b/Deeangband/ItemBase.cpp
index 0c3eff5..3110cae 100644 (file)
--- a/Deeangband/ItemBase.cpp
+++ b/Deeangband/ItemBase.cpp
@@ -43,8 +43,8 @@ namespace Deeangband
                ItemBase itemBase = *this;
                std::ofstream ofs(filename);
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << BOOST_SERIALIZATION_NVP(itemBase);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << BOOST_SERIALIZATION_NVP(itemBase);
        }
 
 }
\ No newline at end of file

diff --git a/Deeangband/ItemTemplate.cpp b/Deeangband/ItemTemplate.cpp
index 575e70b..48aa9a8 100644 (file)
--- a/Deeangband/ItemTemplate.cpp
+++ b/Deeangband/ItemTemplate.cpp
@@ -58,8 +58,8 @@ namespace Deeangband
                ItemTemplate ItemTemplate = *this;
                std::ofstream ofs(filename);
                assert(ofs);
-               boost::archive::xml_oarchive oa(ofs);
-               oa << BOOST_SERIALIZATION_NVP(ItemTemplate);
+               //boost::archive::xml_oarchive oa(ofs);
+               //oa << BOOST_SERIALIZATION_NVP(ItemTemplate);
        }
 
 }
\ No newline at end of file