From: deskull Date: Sat, 22 Jun 2019 12:49:14 +0000 (+0900) Subject: [Modify] boostライブラリに依存した処理を削除中． X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=0749b6f9a20095f3265368ad901b72c0d43b1e0b;p=deeangband%2FDeeangband-new.git [Modify] boostライブラリに依存した処理を削除中． --- diff --git a/Deeangband/Ability.h b/Deeangband/Ability.h index 1b9c65f..f503eaf 100644 --- a/Deeangband/Ability.h +++ b/Deeangband/Ability.h @@ -26,23 +26,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; - - /*! - * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é - * @param archive ƒA[ƒJƒCƒu‰»‚·‚éƒNƒ‰ƒX‚̃AƒhƒŒƒX - * @param version ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“ - * @return XMLSerializeƒeƒ“ƒvƒŒ[ƒg - */ - template void serialize(Archive &archive, const unsigned int version) - { - if(version > 0) - { - archive & boost::serialization::make_nvp("Name", name); - archive & boost::serialization::make_nvp("Description", description); - } - } - public: /*! @@ -65,4 +48,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Ability, 10); diff --git a/Deeangband/Air.h b/Deeangband/Air.h index ea6694c..52aa350 100644 --- a/Deeangband/Air.h +++ b/Deeangband/Air.h @@ -27,28 +27,8 @@ namespace Deeangband { private: - friend class boost::serialization::access; Dice effectDice; //!< ‹óŠÔŠÝ’†‚̃GƒtƒFƒNƒg’l - /*! - * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é - * @param archive ƒA[ƒJƒCƒu‰»‚·‚éƒNƒ‰ƒX‚̃AƒhƒŒƒX - * @param version ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“ - * @return XMLSerializeƒeƒ“ƒvƒŒ[ƒg - */ - template void serialize(Archive &archive, const unsigned int version) - { - if(version >= 0) - { - archive & boost::serialization::make_nvp("Name", name); - archive & boost::serialization::make_nvp("TileID", tileID); - archive & boost::serialization::make_nvp("Symbol", symbol); - archive & boost::serialization::make_nvp("SymbolColor", symbolColor); - archive & boost::serialization::make_nvp("BackColor", backColor); - if(version >= 11) archive & boost::serialization::make_nvp("EffectDice", effectDice); - } - } - public: /*! @@ -71,4 +51,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Air, 11); diff --git a/Deeangband/Authority.h b/Deeangband/Authority.h index a01d030..81281d0 100644 --- a/Deeangband/Authority.h +++ b/Deeangband/Authority.h @@ -23,22 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; - - /*! - * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é - * @param archive ƒA[ƒJƒCƒu‰»‚·‚éƒNƒ‰ƒX‚̃AƒhƒŒƒX - * @param version ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“ - * @return XMLSerializeƒeƒ“ƒvƒŒ[ƒg - */ - template void serialize(Archive &archive, const unsigned int version) - { - if(version >= 0) - { - archive & boost::serialization::make_nvp("Name", name); - } - } - public: /*! @@ -60,4 +44,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::Authority, 10); diff --git a/Deeangband/BaseStatusTable.h b/Deeangband/BaseStatusTable.h index e847945..c356b1f 100644 --- a/Deeangband/BaseStatusTable.h +++ b/Deeangband/BaseStatusTable.h @@ -24,27 +24,6 @@ namespace Deeangband BASE_STATUS status[CS_MAX]; /*!<ƒXƒe[ƒ^ƒX*/ - friend class boost::serialization::access; - - /*! - * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é - * @param archive ƒA[ƒJƒCƒu‰»‚·‚éƒNƒ‰ƒX‚̃AƒhƒŒƒX - * @param version ƒf[ƒ^ƒo[ƒWƒ‡ƒ“ - * @return XMLSerializeƒeƒ“ƒvƒŒ[ƒg - */ - template void serialize(Archive &archive, const unsigned int version) - { - if(version > 0) - { - archive & boost::serialization::make_nvp("STR", status[0]); - archive & boost::serialization::make_nvp("INT", status[1]); - archive & boost::serialization::make_nvp("WIS", status[2]); - archive & boost::serialization::make_nvp("DEX", status[3]); - archive & boost::serialization::make_nvp("CON", status[4]); - archive & boost::serialization::make_nvp("CHA", status[5]); - } - } - public: /*! @@ -116,4 +95,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::BaseStatusTable, 10); diff --git a/Deeangband/Building.h b/Deeangband/Building.h index 84b86ae..9ac347f 100644 --- a/Deeangband/Building.h +++ b/Deeangband/Building.h @@ -23,22 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; - - /*! - * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é - * @param archive ƒA[ƒJƒCƒu‰»‚·‚éƒNƒ‰ƒX‚̃AƒhƒŒƒX - * @param version ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“ - * @return XMLSerializeƒeƒ“ƒvƒŒ[ƒg - */ - template void serialize(Archive &archive, const unsigned int version) - { - if(version >= 0) - { - archive & boost::serialization::make_nvp("Name", name); - } - } - public: /*! @@ -61,4 +45,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Building, 10); diff --git a/Deeangband/Camp.h b/Deeangband/Camp.h index 36a6724..1abd333 100644 --- a/Deeangband/Camp.h +++ b/Deeangband/Camp.h @@ -31,7 +31,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -71,4 +70,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Camp, 10); diff --git a/Deeangband/Color.h b/Deeangband/Color.h index ee76260..d9c72ab 100644 --- a/Deeangband/Color.h +++ b/Deeangband/Color.h @@ -27,7 +27,6 @@ namespace Deeangband int b; //!<Â int a; //!<ƒAƒ‹ƒtƒ@ƒ`ƒƒƒ“ƒlƒ‹ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -100,4 +99,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::Color, 10); diff --git a/Deeangband/Combat.h b/Deeangband/Combat.h index 8cfc8e7..4f0783c 100644 --- a/Deeangband/Combat.h +++ b/Deeangband/Combat.h @@ -24,7 +24,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -81,4 +80,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Combat, 10); diff --git a/Deeangband/Coordinates.h b/Deeangband/Coordinates.h index 916e6db..e912ff0 100644 --- a/Deeangband/Coordinates.h +++ b/Deeangband/Coordinates.h @@ -36,7 +36,6 @@ namespace Deeangband MAP_POSITION fx; //!< XÀ•W MAP_POSITION fy; //!< YÀ•W - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -203,4 +202,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Coordinates, 10); diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp index 483e2fc..8b35274 100644 --- a/Deeangband/Creature.cpp +++ b/Deeangband/Creature.cpp @@ -86,14 +86,14 @@ namespace Deeangband 11100000000, // Lv60“ž’Bƒ\ƒEƒ‹ }; - Creature::Creature(std::map>::iterator speciesIt) + Creature::Creature(std::map>::iterator speciesIt) : GameInstance(), HaveSymbol(), HaveHp(), HaveGameTime(), HavePosition(), HaveInventory(), HaveSize() { WipeData(); SetSpeciesData(&(*speciesIt->second)); } - Creature::Creature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y) + Creature::Creature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y) : GameInstance(), HaveSymbol(), HaveHp(), HaveGameTime(), HavePosition(fieldIt, x, y), HaveInventory(), HaveSize() { WipeData(); @@ -380,37 +380,37 @@ namespace Deeangband return true; } - bool Creature::PickUpItem(std::map>::iterator itemIt) + bool Creature::PickUpItem(std::map>::iterator itemIt) { return true; } - bool Creature::DropItem(std::map>::iterator itemIt) + bool Creature::DropItem(std::map>::iterator itemIt) { return true; } - bool Creature::EatItem(std::map>::iterator itemIt) + bool Creature::EatItem(std::map>::iterator itemIt) { return true; } - bool Creature::QuaffItem(std::map>::iterator itemIt) + bool Creature::QuaffItem(std::map>::iterator itemIt) { return true; } - bool Creature::ActivateItem(std::map>::iterator itemIt) + bool Creature::ActivateItem(std::map>::iterator itemIt) { return true; } - bool Creature::ThrowItem(std::map>::iterator itemIt) + bool Creature::ThrowItem(std::map>::iterator itemIt) { return true; } - bool Creature::ReadItem(std::map>::iterator itemIt) + bool Creature::ReadItem(std::map>::iterator itemIt) { return true; } diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h index e1a9f84..9cad9ec 100644 --- a/Deeangband/Creature.h +++ b/Deeangband/Creature.h @@ -143,7 +143,6 @@ namespace Deeangband */ void Creature::calcHPTable(void); - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -188,7 +187,7 @@ namespace Deeangband * @brief CreatureƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param speciesIt ¶¬Œ³‚Æ‚È‚éƒNƒŠ[ƒ`ƒƒ[Ží•ÊƒCƒeƒŒ[ƒ^ */ - Creature::Creature(std::map>::iterator speciesIt); + Creature::Creature(std::map>::iterator speciesIt); /*! * @brief CreatureƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) @@ -197,7 +196,7 @@ namespace Deeangband * @param x ¶¬æXÀ•W * @param y ¶¬æYÀ•W */ - Creature::Creature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y); + Creature::Creature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y); /*! * @brief CreatureƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ @@ -420,7 +419,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ðE‚¤‚±‚Æ‚ª‚Å‚«‚½‚çtrue‚ð•Ô‚· * @todo Creature::PickUpItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::PickUpItem(std::map>::iterator itemIt); + bool Creature::PickUpItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚ð—Ž‚Æ‚·ˆ— @@ -428,7 +427,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ð—Ž‚Æ‚·‚±‚Æ‚ª‚Å‚«‚½‚çtrue‚ð•Ô‚· * @todo Creature::DropItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::DropItem(std::map>::iterator itemIt); + bool Creature::DropItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚ðH‚ׂ鏈— @@ -436,7 +435,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ðH‚ׂ鏈—‚ðŽŽ‚Ý‚½‚çtrue‚ð•Ô‚· * @todo Creature::EatItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::EatItem(std::map>::iterator itemIt); + bool Creature::EatItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚ðˆù‚ޏˆ— @@ -444,7 +443,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ðˆù‚ޏˆ—‚ðŽŽ‚Ý‚½‚çtrue‚ð•Ô‚· * @todo Creature::QuaffItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::QuaffItem(std::map>::iterator itemIt); + bool Creature::QuaffItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚ð”­“®‚·‚鏈— @@ -452,7 +451,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ð”­“®ˆ—‚ðŽŽ‚Ý‚½‚çtrue‚ð•Ô‚· * @todo Creature::ActivateItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::ActivateItem(std::map>::iterator itemIt); + bool Creature::ActivateItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚𓊝±‚·‚鏈— @@ -460,7 +459,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€“Š±ˆ—‚ðŽŽ‚Ý‚½‚çtrue‚ð•Ô‚· * @todo Creature::ThrowItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::ThrowItem(std::map>::iterator itemIt); + bool Creature::ThrowItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªƒAƒCƒeƒ€‚ð“ǂޏˆ— @@ -468,7 +467,7 @@ namespace Deeangband * @return ŽÀÛ‚ɃAƒCƒeƒ€‚ð“ǂޏˆ—‚ðŽŽ‚Ý‚½‚çtrue‚ð•Ô‚· * @todo Creature::ReadItem()Žž‚É”­¶‚·‚é‰e‹¿‚ÌŽÀ‘• */ - bool Creature::ReadItem(std::map>::iterator itemIt); + bool Creature::ReadItem(std::map>::iterator itemIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ªŽw’è’n“_‚ɐN“ü‰Â”\‚©‚ð•Ô‚· @@ -539,4 +538,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Creature, 10); diff --git a/Deeangband/CreatureTemplate.h b/Deeangband/CreatureTemplate.h index c0c46fb..f23689f 100644 --- a/Deeangband/CreatureTemplate.h +++ b/Deeangband/CreatureTemplate.h @@ -85,4 +85,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::CreatureTemplate, 10); diff --git a/Deeangband/CreatureTrait.h b/Deeangband/CreatureTrait.h index fea3883..9bd1b8d 100644 --- a/Deeangband/CreatureTrait.h +++ b/Deeangband/CreatureTrait.h @@ -29,7 +29,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -70,4 +69,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::CreatureTrait, 10); diff --git a/Deeangband/Dice.h b/Deeangband/Dice.h index c476ba0..aa50fad 100644 --- a/Deeangband/Dice.h +++ b/Deeangband/Dice.h @@ -29,7 +29,6 @@ namespace Deeangband DICE_NUMBER num; //!< ƒ_ƒCƒX‚̐” DICE_SIDE side; //!< ƒ_ƒCƒX‚̖ʐ” - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -169,4 +168,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Dice, 10); diff --git a/Deeangband/Discipline.h b/Deeangband/Discipline.h index 02eaddb..c836bde 100644 --- a/Deeangband/Discipline.h +++ b/Deeangband/Discipline.h @@ -39,7 +39,6 @@ namespace Deeangband NAME name; int disciplinePoint[MAX_DISCIPLINE_TYPES]; - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -149,4 +148,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Discipline, 11); diff --git a/Deeangband/Door.h b/Deeangband/Door.h index 002aa4c..81aa5aa 100644 --- a/Deeangband/Door.h +++ b/Deeangband/Door.h @@ -43,7 +43,6 @@ namespace Deeangband Coordinates position; //!<ŠÝÀ•W DOOR_STATUS status; //!<ƒhƒA‚̏ó‘Ô - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -75,4 +74,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Door, 10); diff --git a/Deeangband/Dungeon.h b/Deeangband/Dungeon.h index 718436a..dbbba17 100644 --- a/Deeangband/Dungeon.h +++ b/Deeangband/Dungeon.h @@ -69,7 +69,6 @@ namespace Deeangband TAG guardianSpecies; //!< ƒ_ƒ“ƒWƒ‡ƒ“‚ÌŽçŒìŽÒƒ^ƒO Coordinates baseSize; //!< ƒ_ƒ“ƒWƒ‡ƒ“‚ÌŠî–{ƒTƒCƒY - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -189,4 +188,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Dungeon, 10); diff --git a/Deeangband/Effect.h b/Deeangband/Effect.h index 8d66bb3..a05cf5a 100644 --- a/Deeangband/Effect.h +++ b/Deeangband/Effect.h @@ -66,7 +66,6 @@ namespace Deeangband std::string name; - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -103,4 +102,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Effect, 10); diff --git a/Deeangband/EngineTypedef.h b/Deeangband/EngineTypedef.h index 26ba385..bad4909 100644 --- a/Deeangband/EngineTypedef.h +++ b/Deeangband/EngineTypedef.h @@ -1,6 +1,6 @@ -typedef std::map> CREATURE_LIST; -typedef std::map>::iterator CREATURE_IT; +typedef std::map> CREATURE_LIST; +typedef std::map>::iterator CREATURE_IT; -typedef std::vector> ACTION_LIST; -typedef std::vector>::iterator ACTION_IT; +typedef std::vector> ACTION_LIST; +typedef std::vector>::iterator ACTION_IT; diff --git a/Deeangband/Field.cpp b/Deeangband/Field.cpp index 24ea349..b5fda23 100644 --- a/Deeangband/Field.cpp +++ b/Deeangband/Field.cpp @@ -12,7 +12,7 @@ namespace Deeangband { - Field::Field(std::map>::iterator dungeonIt, DEPTH depth) : GameInstance() + Field::Field(std::map>::iterator dungeonIt, DEPTH depth) : GameInstance() { Dungeon *dungeonPtr = &(*dungeonIt->second); int x, y; @@ -29,7 +29,7 @@ namespace Deeangband { for(x = 0; x < width; x++) { - squares[y].push_back(boost::shared_ptr(new Square())); + squares[y].push_back(std::shared_ptr(new Square())); if(Dice::Cast(1, 4) == 3) { squares[y][x]->SetFloor(dungeonPtr->GetInnerWallFloorTag()); @@ -108,7 +108,7 @@ namespace Deeangband return this->GetSquare(coord.GetX(), coord.GetY()); } - bool Field::GenerateTrap(std::map>::iterator trapBaseIt, Coordinates *position) + bool Field::GenerateTrap(std::map>::iterator trapBaseIt, Coordinates *position) { traps.emplace(traps.end(), boost::make_shared(trapBaseIt, position)); return true; @@ -208,7 +208,7 @@ namespace Deeangband void Field::createRectRoom(MAP_LENGTH sx, MAP_LENGTH sy, MAP_LENGTH ex, MAP_LENGTH ey) { Square *squarePtr; - std::vector> wallVec; + std::vector> wallVec; MAP_LENGTH x, y; wallVec.clear(); diff --git a/Deeangband/Field.h b/Deeangband/Field.h index d9d876f..5d50c92 100644 --- a/Deeangband/Field.h +++ b/Deeangband/Field.h @@ -30,11 +30,11 @@ namespace Deeangband class Field : public GameInstance { private: - std::vector>> squares; //!<ƒtƒƒAƒ}ƒX‚Ì”z—ñ - std::vector> creatures; //!<ƒNƒŠ[ƒ`ƒƒ[ƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ - std::vector> doors; //!<ƒhƒAƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ - std::vector> traps; //!<ƒgƒ‰ƒbƒvƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ - std::vector> items; //!<ƒAƒCƒeƒ€ƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ + std::vector>> squares; //!<ƒtƒƒAƒ}ƒX‚Ì”z—ñ + std::vector> creatures; //!<ƒNƒŠ[ƒ`ƒƒ[ƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ + std::vector> doors; //!<ƒhƒAƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ + std::vector> traps; //!<ƒgƒ‰ƒbƒvƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ + std::vector> items; //!<ƒAƒCƒeƒ€ƒCƒ“ƒXƒ^ƒ“ƒX‚Ì”z—ñ MAP_LENGTH width; //!< ƒtƒƒA‚̉¡ƒTƒCƒY MAP_LENGTH height; //!< ƒtƒƒA‚̏cƒTƒCƒY @@ -42,7 +42,6 @@ namespace Deeangband TAG dungeonTag; //!< ¶¬Œ³ƒ_ƒ“ƒWƒ‡ƒ“ƒ^ƒO Dungeon *dungeonPtr; //!< ƒ_ƒ“ƒWƒ‡ƒ“ƒ|ƒCƒ“ƒ^ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -88,7 +87,7 @@ namespace Deeangband * * @todo Dungeonî•ñ‚ðŠî‚É‚µ‚½ƒRƒ“ƒXƒgƒ‰ƒNƒ^‚̐¶¬‚ðŽÀ‘• */ - Field::Field(std::map>::iterator dungeonIt, DEPTH depth); + Field::Field(std::map>::iterator dungeonIt, DEPTH depth); /*! @@ -151,7 +150,7 @@ namespace Deeangband * GenerateTrapŠÖ”‚̓^ƒO‚ÅŽwŽ¦‚³‚ꂽƒgƒ‰ƒbƒvŽí•Ê‚̃gƒ‰ƒbƒv‚ðƒtƒƒA‚̏Š’è‚̈ʒu‚É”z’u‚·‚éB
* @todo Field::GenerateTrap‚ÌŽÀ‘• */ - bool Field::GenerateTrap(std::map>::iterator trapBaseIt, Coordinates *position); + bool Field::GenerateTrap(std::map>::iterator trapBaseIt, Coordinates *position); /*! * @brief Žw’è’n“_‚©‚ç‚ÌŽ‹ŠE‚ð•Ô‚· @@ -211,4 +210,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Field, 10); diff --git a/Deeangband/FixedArtifact.h b/Deeangband/FixedArtifact.h index 06300d0..42fe029 100644 --- a/Deeangband/FixedArtifact.h +++ b/Deeangband/FixedArtifact.h @@ -23,7 +23,6 @@ namespace Deeangband class FixedArtifact : public ItemTemplate { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -64,4 +63,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::FixedArtifact, 10); diff --git a/Deeangband/FixedField.h b/Deeangband/FixedField.h index da36c1d..31ab341 100644 --- a/Deeangband/FixedField.h +++ b/Deeangband/FixedField.h @@ -26,7 +26,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -54,4 +53,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::FixedField, 10); diff --git a/Deeangband/Floor.h b/Deeangband/Floor.h index 57ae4d5..3305455 100644 --- a/Deeangband/Floor.h +++ b/Deeangband/Floor.h @@ -26,7 +26,6 @@ namespace Deeangband private: - friend class boost::serialization::access; bool isWall; //! •Ç’nŒ`‚Å‚ ‚é‚©‚Ç‚¤‚©‚Ì”»’è @@ -73,4 +72,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Floor, 11); diff --git a/Deeangband/GameCampaign.h b/Deeangband/GameCampaign.h index ef309f5..e648458 100644 --- a/Deeangband/GameCampaign.h +++ b/Deeangband/GameCampaign.h @@ -36,7 +36,6 @@ namespace Deeangband DEPTH startDepth; //!<ƒvƒŒƒCƒ„[‚ÌŠJŽnŠK‘w TAG finalQuest; //!<ÅIƒNƒGƒXƒgƒ^ƒO - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -82,4 +81,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::GameCampaign, 10); diff --git a/Deeangband/GameConstants.h b/Deeangband/GameConstants.h index a21a503..b412478 100644 --- a/Deeangband/GameConstants.h +++ b/Deeangband/GameConstants.h @@ -30,7 +30,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -62,4 +61,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::GameConstants, 10); diff --git a/Deeangband/GameElement.h b/Deeangband/GameElement.h index 6661548..9f034a3 100644 --- a/Deeangband/GameElement.h +++ b/Deeangband/GameElement.h @@ -24,7 +24,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -109,4 +108,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::GameElement, 10); diff --git a/Deeangband/GameInstance.h b/Deeangband/GameInstance.h index aac4ab5..9142b03 100644 --- a/Deeangband/GameInstance.h +++ b/Deeangband/GameInstance.h @@ -20,7 +20,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -87,4 +86,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::GameInstance, 10); diff --git a/Deeangband/GameLogger.h b/Deeangband/GameLogger.h index fa54ea9..17a2100 100644 --- a/Deeangband/GameLogger.h +++ b/Deeangband/GameLogger.h @@ -23,7 +23,7 @@ namespace Deeangband { protected: std::ofstream ofs; - std::vector> gameMessages; //!< ƒQ[ƒ€ƒƒO”z—ñ + std::vector> gameMessages; //!< ƒQ[ƒ€ƒƒO”z—ñ public: diff --git a/Deeangband/GameMessage.h b/Deeangband/GameMessage.h index 1490547..648296e 100644 --- a/Deeangband/GameMessage.h +++ b/Deeangband/GameMessage.h @@ -32,7 +32,6 @@ namespace Deeangband std::string message; GAMEMESSAGE_TYPE type; - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -75,4 +74,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::GameMessage, 10); diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp index 8fc5be3..77065a6 100644 --- a/Deeangband/GameSurfaceSDL.cpp +++ b/Deeangband/GameSurfaceSDL.cpp @@ -137,8 +137,8 @@ namespace Deeangband void GameSurfaceSDL::initInterfaces(GameWorld *gameWorld) { - std::map>::iterator floorIt; - std::map>::iterator speciesIt; + std::map>::iterator floorIt; + std::map>::iterator speciesIt; SDL_Surface *surface, *tempSurface, *symbolSurface; //! @note TTFƒtƒHƒ“ƒg‚̓ǂݍž‚Ý diff --git a/Deeangband/GameSurfaceSDL.h b/Deeangband/GameSurfaceSDL.h index b807055..4940565 100644 --- a/Deeangband/GameSurfaceSDL.h +++ b/Deeangband/GameSurfaceSDL.h @@ -17,7 +17,6 @@ #include "GameSurface.h" -BOOST_CLASS_VERSION(GameSurfaceSDL, 1); namespace Deeangband { diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp index d4507f8..3080df6 100644 --- a/Deeangband/GameWorld.cpp +++ b/Deeangband/GameWorld.cpp @@ -64,8 +64,8 @@ namespace Deeangband void GameWorld::Initialize(void) { int i; - std::map>::iterator fieldIt; - std::map>::iterator speciesIt; + std::map>::iterator fieldIt; + std::map>::iterator speciesIt; fieldList.emplace(0, boost::make_shared(dungeonList.find("VANILLA_WOMB"), 1)); fieldIt = fieldList.find(0); @@ -87,7 +87,7 @@ namespace Deeangband { } - bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt) + bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt) { creatureList.emplace(this->creatureID, boost::make_shared(speciesIt)); do @@ -97,9 +97,9 @@ namespace Deeangband return true; } - bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y) + bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y) { - std::map>::iterator creatureIt; + std::map>::iterator creatureIt; HaveGameTime *test; creatureList.emplace(this->creatureID, boost::make_shared(speciesIt, fieldIt, x, y)); creatureIt = creatureList.find(this->creatureID); @@ -655,7 +655,7 @@ namespace Deeangband return &(*creatureList[id]); } - std::map> *GameWorld::GetAbilityList(void) + std::map> *GameWorld::GetAbilityList(void) { return &(this->abilityList); } @@ -701,12 +701,12 @@ namespace Deeangband return &(*floorList[tag]); } - std::map> *GameWorld::GetFloorList(void) + std::map> *GameWorld::GetFloorList(void) { return &floorList; } - std::map> *GameWorld::GetSpeciesList(void) + std::map> *GameWorld::GetSpeciesList(void) { return &speciesList; } diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h index b0795b2..f04b6db 100644 --- a/Deeangband/GameWorld.h +++ b/Deeangband/GameWorld.h @@ -11,7 +11,6 @@ #include "stdafx.h" #include "Deeangband.h" -BOOST_CLASS_VERSION(GameWorld, 1); namespace Deeangband { @@ -60,47 +59,46 @@ namespace Deeangband private: //Ã“Iƒf[ƒ^ƒŠƒXƒg - std::map> airList; /*!<‘S‘å‹C’nŒ`ƒŠƒXƒg*/ - std::map> abilityList; /*!<‘S”­“®‹Z”\ƒŠƒXƒg*/ - std::map> authorityList; /*!<‘SŒ ”\ƒŠƒXƒg*/ - std::map> buildingList; /*!<‘SŽ{ÝƒŠƒXƒg*/ - std::map> campList; /*!<‘Sw‰cƒŠƒXƒg*/ - std::map> creatureTraitList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[“Á«ƒŠƒXƒg*/ - std::map> dungeonList; /*!<‘Sƒ_ƒ“ƒWƒ‡ƒ“ƒŠƒXƒg*/ - std::map> effectList; /*!<‘SŒø‰Ê‘®«ƒŠƒXƒg*/ - std::map> floorList; /*!<‘S°’nŒ`ƒŠƒXƒg*/ - std::map> fixedArtifactList; /*!<‘SŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒgƒŠƒXƒg*/ - std::map> itemBaseList; /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/ - std::map> itemEgoList; /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/ - std::map> itemTraitList; /*!<‘SƒAƒCƒeƒ€“Á«ƒŠƒXƒg*/ - std::map> karmaList; /*!<‘SƒJƒ‹ƒ}ƒŠƒXƒg*/ - std::map> questList; /*!<‘SƒNƒGƒXƒg“Á«ƒŠƒXƒg*/ - std::map> spaceList; /*!<‘S‹óŠÔ’nŒ`ƒŠƒXƒg*/ - std::map> skillList; /*!<‘SƒXƒLƒ‹ƒŠƒXƒg*/ - std::map> speciesList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[Ží•ÊƒŠƒXƒg*/ - std::map> startingClassList; /*!<‘SoŽ©ƒŠƒXƒg*/ - std::map> raceList; /*!<‘SŽí‘°ƒŠƒXƒg*/ - std::map> trapBaseList; /*!<‘Sƒgƒ‰ƒbƒvƒx[ƒXŽí•ÊƒŠƒXƒg*/ + std::map> airList; /*!<‘S‘å‹C’nŒ`ƒŠƒXƒg*/ + std::map> abilityList; /*!<‘S”­“®‹Z”\ƒŠƒXƒg*/ + std::map> authorityList; /*!<‘SŒ ”\ƒŠƒXƒg*/ + std::map> buildingList; /*!<‘SŽ{ÝƒŠƒXƒg*/ + std::map> campList; /*!<‘Sw‰cƒŠƒXƒg*/ + std::map> creatureTraitList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[“Á«ƒŠƒXƒg*/ + std::map> dungeonList; /*!<‘Sƒ_ƒ“ƒWƒ‡ƒ“ƒŠƒXƒg*/ + std::map> effectList; /*!<‘SŒø‰Ê‘®«ƒŠƒXƒg*/ + std::map> floorList; /*!<‘S°’nŒ`ƒŠƒXƒg*/ + std::map> fixedArtifactList; /*!<‘SŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒgƒŠƒXƒg*/ + std::map> itemBaseList; /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/ + std::map> itemEgoList; /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/ + std::map> itemTraitList; /*!<‘SƒAƒCƒeƒ€“Á«ƒŠƒXƒg*/ + std::map> karmaList; /*!<‘SƒJƒ‹ƒ}ƒŠƒXƒg*/ + std::map> questList; /*!<‘SƒNƒGƒXƒg“Á«ƒŠƒXƒg*/ + std::map> spaceList; /*!<‘S‹óŠÔ’nŒ`ƒŠƒXƒg*/ + std::map> skillList; /*!<‘SƒXƒLƒ‹ƒŠƒXƒg*/ + std::map> speciesList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[Ží•ÊƒŠƒXƒg*/ + std::map> startingClassList; /*!<‘SoŽ©ƒŠƒXƒg*/ + std::map> raceList; /*!<‘SŽí‘°ƒŠƒXƒg*/ + std::map> trapBaseList; /*!<‘Sƒgƒ‰ƒbƒvƒx[ƒXŽí•ÊƒŠƒXƒg*/ //“®“Iƒf[ƒ^ƒŠƒXƒg - std::map> itemList; /*!<‘SƒAƒCƒeƒ€ƒŠƒXƒg*/ + std::map> itemList; /*!<‘SƒAƒCƒeƒ€ƒŠƒXƒg*/ CREATURE_LIST creatureList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[ƒŠƒXƒg*/ - std::map> fieldList; /*!<‘SƒtƒƒAƒŠƒXƒg*/ - std::map> trapList; /*!<‘Sƒgƒ‰ƒbƒvƒŠƒXƒg*/ + std::map> fieldList; /*!<‘SƒtƒƒAƒŠƒXƒg*/ + std::map> trapList; /*!<‘Sƒgƒ‰ƒbƒvƒŠƒXƒg*/ ID itemID; //!<‹ó‚«ƒAƒCƒeƒ€ID ID creatureID; //!<‹ó‚«ƒNƒŠ[ƒ`ƒƒ[ID ID fieldID; //!<‹ó‚«ƒtƒB[ƒ‹ƒhID ID trapID; //!<‹ó‚«ƒgƒ‰ƒbƒvID - std::vector> actionList; /*!<s“®‡ƒŠƒXƒg*/ + std::vector> actionList; /*!<s“®‡ƒŠƒXƒg*/ std::vector actionList2; /*!<s“®‡ƒŠƒXƒg*/ std::vector actionList3; /*!<s“®‡ƒŠƒXƒg*/ CREATURE_IT playerIt; //!< ƒvƒŒƒCƒ„[ƒNƒŠ[ƒ`ƒƒ[ŽQÆƒ|ƒCƒ“ƒ^ GAME_TIME gameTime; //!<ƒQ[ƒ€ŽžŠÔ - friend class boost::serialization::access; /*! * @brief ‘å‹C’nŒ`î•ñ‚̃Z[ƒu @@ -329,7 +327,7 @@ namespace Deeangband * @param creatureTag ƒNƒŠ[ƒ`ƒƒ[ƒ^ƒO * @return ¶¬‚ɐ¬Œ÷‚µ‚½ê‡true‚ð•Ô‚· */ - bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt); + bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚𐶐¬‚µGameWorld’†‚̏”—v‘f‚ƘAŒg‚³‚¹‚é @@ -339,7 +337,7 @@ namespace Deeangband * @param y ”z’uæYÀ•W * @return ¶¬‚ɐ¬Œ÷‚µ‚½ê‡true‚ð•Ô‚· */ - bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y); + bool GameWorld::GenerateCreature(std::map>::iterator& speciesIt, std::map>::iterator& fieldIt, MAP_LENGTH x, MAP_LENGTH y); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚錠”\‚ð•Ô‚· @@ -471,7 +469,7 @@ namespace Deeangband * @brief GameWorld’†‚É‘¶Ý‚·‚é”­“®‹Z”\‚ð•Ô‚· * @return ‘S”­“®‹Z”\‚̃ŠƒXƒg */ - std::map> *GameWorld::GetAbilityList(void); + std::map> *GameWorld::GetAbilityList(void); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒNƒŠ[ƒ`ƒƒ[‚ð•Ô‚· @@ -538,9 +536,9 @@ namespace Deeangband */ Floor *GameWorld::GetFloorFromPosition(ID fieldID, Coordinates *positionPtr); - std::map> *GameWorld::GetFloorList(void); + std::map> *GameWorld::GetFloorList(void); - std::map> *GameWorld::GetSpeciesList(void); + std::map> *GameWorld::GetSpeciesList(void); /*! * @brief ŽžŠÔŒo‰ßˆ—‚ðs‚¢AŽŸ‚̃AƒNƒVƒ‡ƒ“ƒIƒuƒWƒFƒNƒg‚ð•Ô‚·B diff --git a/Deeangband/HaveGameTime.h b/Deeangband/HaveGameTime.h index 5509a53..ed54377 100644 --- a/Deeangband/HaveGameTime.h +++ b/Deeangband/HaveGameTime.h @@ -25,7 +25,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -106,4 +105,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::HaveGameTime, 10); diff --git a/Deeangband/HaveHp.h b/Deeangband/HaveHp.h index bac3846..ae71626 100644 --- a/Deeangband/HaveHp.h +++ b/Deeangband/HaveHp.h @@ -23,7 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -118,4 +117,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::HaveHp, 10); diff --git a/Deeangband/HaveInventory.h b/Deeangband/HaveInventory.h index 505d2e5..c12ea17 100644 --- a/Deeangband/HaveInventory.h +++ b/Deeangband/HaveInventory.h @@ -25,7 +25,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -67,4 +66,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::HaveInventory, 10); diff --git a/Deeangband/HavePosition.cpp b/Deeangband/HavePosition.cpp index 23ba536..e4769ab 100644 --- a/Deeangband/HavePosition.cpp +++ b/Deeangband/HavePosition.cpp @@ -31,7 +31,7 @@ namespace Deeangband return; } - HavePosition::HavePosition(std::map>::iterator fieldIt, MAP_LENGTH x, MAP_LENGTH y) + HavePosition::HavePosition(std::map>::iterator fieldIt, MAP_LENGTH x, MAP_LENGTH y) { this->position.Set(x, y); this->fieldID = fieldIt->first; diff --git a/Deeangband/HavePosition.h b/Deeangband/HavePosition.h index 39bda6d..bc0b67a 100644 --- a/Deeangband/HavePosition.h +++ b/Deeangband/HavePosition.h @@ -25,7 +25,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -46,7 +45,7 @@ namespace Deeangband Coordinates position; //!< ŠÝÀ•W ID fieldID; //!< Œ»ÝƒtƒƒAID - boost::shared_ptr fieldPtr; //!< Œ»ÝƒtƒƒAŽQÆƒ|ƒCƒ“ƒ^ + std::shared_ptr fieldPtr; //!< Œ»ÝƒtƒƒAŽQÆƒ|ƒCƒ“ƒ^ public: @@ -68,7 +67,7 @@ namespace Deeangband * @param x ‰ŠúxÀ•W * @param y ‰ŠúyÀ•W */ - HavePosition::HavePosition(std::map>::iterator fieldIt, MAP_LENGTH x, MAP_LENGTH y); + HavePosition::HavePosition(std::map>::iterator fieldIt, MAP_LENGTH x, MAP_LENGTH y); /*! @@ -112,4 +111,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::HavePosition, 10); diff --git a/Deeangband/HaveRace.h b/Deeangband/HaveRace.h index 2918c99..cdcfa93 100644 --- a/Deeangband/HaveRace.h +++ b/Deeangband/HaveRace.h @@ -23,7 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -65,4 +64,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::HaveRace, 10); diff --git a/Deeangband/HaveSize.h b/Deeangband/HaveSize.h index d15f4e8..35f1066 100644 --- a/Deeangband/HaveSize.h +++ b/Deeangband/HaveSize.h @@ -23,7 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -83,4 +82,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::HaveSize, 10); diff --git a/Deeangband/HaveSymbol.h b/Deeangband/HaveSymbol.h index 33e1074..0b06cfb 100644 --- a/Deeangband/HaveSymbol.h +++ b/Deeangband/HaveSymbol.h @@ -23,7 +23,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -92,4 +91,3 @@ namespace Deeangband }; } -BOOST_CLASS_VERSION(Deeangband::HaveSymbol, 10); diff --git a/Deeangband/Item.cpp b/Deeangband/Item.cpp index 25b4081..16ed664 100644 --- a/Deeangband/Item.cpp +++ b/Deeangband/Item.cpp @@ -18,7 +18,7 @@ Item::Item(void) : ItemTemplate(), GameInstance(), HaveGameTime(), HavePosition( } -Item::Item(std::map>::iterator itemBaseIt) : ItemTemplate(), GameInstance(), HaveGameTime(), HavePosition() +Item::Item(std::map>::iterator itemBaseIt) : ItemTemplate(), GameInstance(), HaveGameTime(), HavePosition() { this->WipeData(); this->weight = itemBaseIt->second->GetWeight(); diff --git a/Deeangband/Item.h b/Deeangband/Item.h index 43eea37..d65c78c 100644 --- a/Deeangband/Item.h +++ b/Deeangband/Item.h @@ -21,7 +21,6 @@ #include "HaveSymbol.h" #include "HavePosition.h" -BOOST_CLASS_VERSION(Item, 1); namespace Deeangband { @@ -39,7 +38,6 @@ namespace Deeangband SavingTable baseSaving; //!< Šî–{ƒZ[ƒrƒ“ƒOC³ SavingTable plusSaving; //!< ’ljÁƒZ[ƒrƒ“ƒOC³ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -69,7 +67,7 @@ namespace Deeangband * @brief ItemƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ * @param itemBaseIt */ - Item::Item(std::map>::iterator itemBaseIt); + Item::Item(std::map>::iterator itemBaseIt); /*! * @brief ItemƒNƒ‰ƒXƒfƒXƒgƒ‰ƒNƒ^ diff --git a/Deeangband/ItemBase.h b/Deeangband/ItemBase.h index 55c0077..dd6da5c 100644 --- a/Deeangband/ItemBase.h +++ b/Deeangband/ItemBase.h @@ -15,7 +15,6 @@ #include "SavingTable.h" #include "HaveSymbol.h" -BOOST_CLASS_VERSION(ItemBase, 1); namespace Deeangband { @@ -43,7 +42,6 @@ namespace Deeangband SavingTable baseSaving; //!< Šî–{ƒZ[ƒrƒ“ƒOC³ SavingTable plusSaving; //!< ’ljÁƒZ[ƒrƒ“ƒOC³ - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int) { archive & boost::serialization::make_nvp("Name", name); diff --git a/Deeangband/ItemEgo.h b/Deeangband/ItemEgo.h index 6c3017d..8989ae8 100644 --- a/Deeangband/ItemEgo.h +++ b/Deeangband/ItemEgo.h @@ -13,7 +13,6 @@ #include "SavingTable.h" #include "HaveSymbol.h" -BOOST_CLASS_VERSION(ItemEgo, 1); namespace Deeangband { @@ -38,7 +37,6 @@ namespace Deeangband private: - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int) { diff --git a/Deeangband/ItemTemplate.h b/Deeangband/ItemTemplate.h index 591bf37..3a89b0d 100644 --- a/Deeangband/ItemTemplate.h +++ b/Deeangband/ItemTemplate.h @@ -34,7 +34,6 @@ namespace Deeangband SavingTable baseSaving; //!< Šî–{ƒZ[ƒrƒ“ƒOC³ SavingTable plusSaving; //!< ’ljÁƒZ[ƒrƒ“ƒOC³ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -147,4 +146,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::ItemTemplate, 10); diff --git a/Deeangband/ItemTrait.h b/Deeangband/ItemTrait.h index dfe08b5..436d958 100644 --- a/Deeangband/ItemTrait.h +++ b/Deeangband/ItemTrait.h @@ -21,7 +21,6 @@ namespace Deeangband private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é diff --git a/Deeangband/Karma.h b/Deeangband/Karma.h index 6fee3a1..187976b 100644 --- a/Deeangband/Karma.h +++ b/Deeangband/Karma.h @@ -76,7 +76,6 @@ namespace Deeangband Discipline desciplinePlus; //!< C—{’lC³ TAG antiKarma; //!< ‘Η§ƒJƒ‹ƒ} - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -118,4 +117,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Karma, 10); diff --git a/Deeangband/Lore.h b/Deeangband/Lore.h index 37ef3ca..63941d5 100644 --- a/Deeangband/Lore.h +++ b/Deeangband/Lore.h @@ -24,7 +24,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -84,4 +83,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Lore, 10); diff --git a/Deeangband/MixedRace.h b/Deeangband/MixedRace.h index e8014cc..caa073a 100644 --- a/Deeangband/MixedRace.h +++ b/Deeangband/MixedRace.h @@ -27,7 +27,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -61,4 +60,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::MixedRace, 10); diff --git a/Deeangband/Quest.h b/Deeangband/Quest.h index 8d38528..118c076 100644 --- a/Deeangband/Quest.h +++ b/Deeangband/Quest.h @@ -25,7 +25,6 @@ namespace Deeangband std::string name; //!< ƒNƒGƒXƒg–¼ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -63,4 +62,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Quest, 10); diff --git a/Deeangband/Race.h b/Deeangband/Race.h index 74b335c..0bfcfe5 100644 --- a/Deeangband/Race.h +++ b/Deeangband/Race.h @@ -54,7 +54,6 @@ namespace Deeangband BaseStatusTable pureStatusPlus; /*!<ƒŒŒƒXƒe[ƒ^ƒXC³*/ BaseStatusTable halfStatusPlus; /*!<¬ŒŒƒXƒe[ƒ^ƒXC³*/ - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -94,4 +93,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Race, 10); diff --git a/Deeangband/SavingTable.h b/Deeangband/SavingTable.h index 3304d65..765dea0 100644 --- a/Deeangband/SavingTable.h +++ b/Deeangband/SavingTable.h @@ -26,7 +26,6 @@ namespace Deeangband EV evasion; /*!< ‰ñ”ðƒZ[ƒu’l */ VO volition; /*!< ˆÓŽvƒZ[ƒu’l */ - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int) { archive & BOOST_SERIALIZATION_NVP(armor); @@ -72,4 +71,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::SavingTable, 10); diff --git a/Deeangband/Skill.h b/Deeangband/Skill.h index e0df5fd..c254ce7 100644 --- a/Deeangband/Skill.h +++ b/Deeangband/Skill.h @@ -28,7 +28,6 @@ namespace Deeangband std::string name; std::string details; - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -87,4 +86,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Skill, 1); diff --git a/Deeangband/Space.h b/Deeangband/Space.h index 14ad1bd..abf7ab8 100644 --- a/Deeangband/Space.h +++ b/Deeangband/Space.h @@ -25,7 +25,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -67,4 +66,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Space, 10); diff --git a/Deeangband/Species.h b/Deeangband/Species.h index 70cdf7c..3cde365 100644 --- a/Deeangband/Species.h +++ b/Deeangband/Species.h @@ -46,7 +46,6 @@ namespace Deeangband std::vector authorityTags; //!< Œ ”\ƒ^ƒO”z—ñ - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int version) { if(version >= 0) @@ -128,4 +127,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Species, 10); diff --git a/Deeangband/Square.cpp b/Deeangband/Square.cpp index 2e99925..32d1321 100644 --- a/Deeangband/Square.cpp +++ b/Deeangband/Square.cpp @@ -19,7 +19,7 @@ namespace Deeangband WipeData(); } - Square::Square(std::map>::iterator& floorIt) : GameElement(), HaveInventory(), HaveHp() + Square::Square(std::map>::iterator& floorIt) : GameElement(), HaveInventory(), HaveHp() { WipeData(); this->floorPtr = floorIt->second.get(); diff --git a/Deeangband/Square.h b/Deeangband/Square.h index 7b6d6bd..fa9eac3 100644 --- a/Deeangband/Square.h +++ b/Deeangband/Square.h @@ -30,7 +30,6 @@ namespace Deeangband TAG airTag; //!<‘å‹C’nŒ`ƒ^ƒO Floor *floorPtr; - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int) { archive & boost::serialization::make_nvp("Floor", floorTag); @@ -45,7 +44,7 @@ namespace Deeangband */ Square::Square(); - Square::Square(std::map>::iterator& floorIt); + Square::Square(std::map>::iterator& floorIt); /*! @@ -112,4 +111,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Square, 10); diff --git a/Deeangband/Stair.h b/Deeangband/Stair.h index eeaee23..1ba275f 100644 --- a/Deeangband/Stair.h +++ b/Deeangband/Stair.h @@ -25,7 +25,6 @@ namespace Deeangband Coordinates position1; //!<Ú‘±À•W1 Coordinates position2; //!<Ú‘±À•W2 - friend class boost::serialization::access; template void serialize(Archive &archive, const unsigned int version) { if(version >= 0) @@ -58,4 +57,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Stair, 10); diff --git a/Deeangband/StartingClass.h b/Deeangband/StartingClass.h index 994227e..5a7d3aa 100644 --- a/Deeangband/StartingClass.h +++ b/Deeangband/StartingClass.h @@ -37,7 +37,6 @@ namespace Deeangband { private: - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -90,4 +89,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::StartingClass, 10); diff --git a/Deeangband/Trap.cpp b/Deeangband/Trap.cpp index 485e97f..0c56f90 100644 --- a/Deeangband/Trap.cpp +++ b/Deeangband/Trap.cpp @@ -16,7 +16,7 @@ namespace Deeangband this->WipeData(); } - Trap::Trap(std::map>::iterator trapBaseIt, Coordinates *position) : GameInstance() + Trap::Trap(std::map>::iterator trapBaseIt, Coordinates *position) : GameInstance() { this->WipeData(); this->position = *position; diff --git a/Deeangband/Trap.h b/Deeangband/Trap.h index b59850a..cfe221a 100644 --- a/Deeangband/Trap.h +++ b/Deeangband/Trap.h @@ -42,7 +42,6 @@ namespace Deeangband HP maxHP; //!<Å‘å‘Ï‹v“x POWER difficulty; //!<‰ðœ“ï“x - friend class boost::serialization::access; /*! * @brief ƒNƒ‰ƒX‚̃VƒŠƒAƒ‰ƒCƒY‚ðÝ’è‚·‚é @@ -72,7 +71,7 @@ namespace Deeangband /*! * @brief TrapƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ */ - Trap::Trap(std::map>::iterator trapBaseIt, Coordinates *position); + Trap::Trap(std::map>::iterator trapBaseIt, Coordinates *position); /*! * @brief TrapƒNƒ‰ƒXƒfƒXƒgƒ‰ƒNƒ^ @@ -89,4 +88,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::Trap, 10); diff --git a/Deeangband/TrapBase.h b/Deeangband/TrapBase.h index 5462869..209581d 100644 --- a/Deeangband/TrapBase.h +++ b/Deeangband/TrapBase.h @@ -32,7 +32,6 @@ namespace Deeangband */ class TrapBase : public GameElement { - friend class boost::serialization::access; DEPTH minDepth; //!<¶¬Å’áŠK‘w DEPTH maxDepth; //!<¶¬Å‘åŠK‘w RARITY rarity; //!<¶¬ƒŒƒAƒŠƒeƒB @@ -71,4 +70,3 @@ namespace Deeangband } -BOOST_CLASS_VERSION(Deeangband::TrapBase, 10); diff --git a/Deeangband/stdafx.h b/Deeangband/stdafx.h index fe02bfd..7f73fef 100644 --- a/Deeangband/stdafx.h +++ b/Deeangband/stdafx.h @@ -23,7 +23,6 @@ #include #include - //! ƒvƒƒOƒ‰ƒ€‚É•K—v‚ȒljÁƒwƒbƒ_[‚ð‚±‚±‚ÅŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B #include #include @@ -41,29 +40,3 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include