HaveGameTime::PlusWait()に正規乱数フラグを付加。（但し未実装） / Add normalRand value to HaveGameTime...

diff --git a/Deeangband/EngineTypedef.h b/Deeangband/EngineTypedef.h
index fcfd095..402218b 100644 (file)
--- a/Deeangband/EngineTypedef.h
+++ b/Deeangband/EngineTypedef.h
@@ -1,3 +1,5 @@
 
 typedef std::map<ID, boost::shared_ptr<Creature>> CREATURE_LIST;
 typedef std::map<ID, boost::shared_ptr<Creature>>::iterator CREATURE_IT;
+
+typedef std::vector<boost::shared_ptr<HaveGameTime>> ACTION_LIST;

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index 95a28b5..39ccfcd 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -57,6 +57,7 @@ namespace Deeangband
        {
                creatureList.emplace(this->creatureID, boost::make_shared<Creature>(speciesList.find(creatureTag), fieldID, x, y));
                actionList.push_back(creatureList[this->creatureID]);
+               creatureList[this->creatureID]->PlusWait(10);
                do
                {
                        this->creatureID++;
@@ -629,7 +630,7 @@ namespace Deeangband
                return this->playerPtr;
        }
 
-       std::vector<boost::shared_ptr<HaveGameTime>>* GameWorld::GetActionList(void)
+       ACTION_LIST* GameWorld::GetActionList(void)
        {
                return &(this->actionList);
        }

diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h
index 053d458..4c63e4b 100644 (file)
--- a/Deeangband/GameWorld.h
+++ b/Deeangband/GameWorld.h
@@ -79,7 +79,7 @@ namespace Deeangband
 
                //\93®\93I\83f\81[\83^\83\8a\83X\83g
                std::map<ID, boost::shared_ptr<Item>> itemList;                    /*!<\91S\83A\83C\83e\83\80\83\8a\83X\83g*/
-               CREATURE_LIST creatureList;            /*!<\91S\83N\83\8a\81[\83`\83\83\81[\83\8a\83X\83g*/
+               CREATURE_LIST creatureList;     /*!<\91S\83N\83\8a\81[\83`\83\83\81[\83\8a\83X\83g*/
                std::map<ID, boost::shared_ptr<Field>> fieldList;                  /*!<\91S\83t\83\8d\83A\83\8a\83X\83g*/
                std::map<ID, boost::shared_ptr<Trap>> trapList;                    /*!<\91S\83g\83\89\83b\83v\83\8a\83X\83g*/
 
@@ -507,7 +507,7 @@ namespace Deeangband
                 * @brief \8ds\93®\8f\87\83\8a\83X\83g\82ð\95Ô\82·
                 * @return \8ds\93®\8f\87\83\8a\83X\83g
                 */
-               std::vector<boost::shared_ptr<HaveGameTime>>* GameWorld::GetActionList(void);
+               ACTION_LIST *GameWorld::GetActionList(void);
 
                /*!
                 * @brief \8ew\92è\83t\83B\81[\83\8b\83h\8by\82Ñ\8dÀ\95W\82É\91¶\8dÝ\82·\82é\83N\83\8a\81[\83`\83\83\81[\82ª\82¢\82é\82©\82ð\94»\95Ê\82µ\83N\83\8a\81[\83`\83\83\81[\82ð\95Ô\82·\81B