インクルード参照関係を一部修正。 / Fix some include references.

diff --git a/Deeangband/GameEngine.cpp b/Deeangband/GameEngine.cpp
index 7c638ef..02147c5 100644 (file)
--- a/Deeangband/GameEngine.cpp
+++ b/Deeangband/GameEngine.cpp
@@ -11,6 +11,8 @@
 #include "stdafx.h"
 #include "GameEngine.h"
 
+#include "HaveGameTime.h"
+#include "Creature.h"
 
 namespace Deeangband
 {
@@ -36,7 +38,7 @@ namespace Deeangband
                while(code == PLAY_EXIT_NONE)
                {
                        this->gameSurface->UpdateTimeStatus(this->gameWorld->GetGameTime());
-                       actionIt = this->toNextProcess();
+                       //actionIt = this->toNextProcess();
                        commandID = gameSurface->GetCommand(gameWorld->GetPlayerCreature());
                        code = DoGameCommand(commandID);
                        ProcessDeadCreatures();

diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index 58aec1b..536cde1 100644 (file)
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -11,6 +11,11 @@
 #include "stdafx.h"
 #include "GameSurfaceSDL.h"
 
+#include "GameEngine.h"
+
+#include "Creature.h"
+#include "Field.h"
+
 namespace Deeangband
 {
 

diff --git a/Deeangband/GameSurfaceSDL.h b/Deeangband/GameSurfaceSDL.h
index 341ed5d..f893ff5 100644 (file)
--- a/Deeangband/GameSurfaceSDL.h
+++ b/Deeangband/GameSurfaceSDL.h
@@ -21,6 +21,7 @@ BOOST_CLASS_VERSION(GameSurfaceSDL, 1);
 
 namespace Deeangband
 {
+       class Creature;
 
        /*! 
         * @class GameSurfaceSDL

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index d694927..c8d43a4 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -10,11 +10,40 @@
 #include "GameWorld.h"
 #include "Deeangband.h"
 
+#include "Coordinates.h"
+#include "HaveGameTime.h"
+
+#include "Air.h"
+#include "Ability.h"
+#include "Authority.h"
+#include "Building.h"
+#include "Camp.h"
+#include "CreatureTrait.h"
+
 #include "Creature.h"
 #include "Dungeon.h"
 #include "Effect.h"
 #include "Floor.h"
 
+#include "FixedArtifact.h"
+#include "GameMessage.h"
+#include "ItemBase.h"
+#include "ItemEgo.h"
+#include "ItemTrait.h"
+#include "Karma.h"
+#include "Lore.h"
+#include "Quest.h"
+#include "Race.h"
+#include "Space.h"
+#include "Skill.h"
+#include "Species.h"
+#include "StartingClass.h"
+#include "TrapBase.h"
+
+#include "Item.h"
+#include "Field.h"
+#include "Trap.h"
+
 namespace Deeangband
 {
 
@@ -50,7 +79,7 @@ namespace Deeangband
        bool GameWorld::GenerateCreature(TAG creatureTag)
        {
                creatureList.emplace(this->creatureID, boost::make_shared<Creature>(speciesList.find(creatureTag)));
-               actionList.push_back(creatureList[this->creatureID]);
+               //actionList.push_back(creatureList[this->creatureID]);
                do
                {
                        this->creatureID++;
@@ -61,7 +90,7 @@ namespace Deeangband
        bool GameWorld::GenerateCreature(TAG creatureTag, ID fieldID, int x, int y)
        {
                creatureList.emplace(this->creatureID, boost::make_shared<Creature>(speciesList.find(creatureTag), fieldID, x, y));
-               actionList.push_back(creatureList[this->creatureID]);
+               //actionList.push_back(creatureList[this->creatureID]);
                creatureList[this->creatureID]->PlusWait(100, TRUE);
                do
                {

diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h
index d92cd10..7992806 100644 (file)
--- a/Deeangband/GameWorld.h
+++ b/Deeangband/GameWorld.h
@@ -11,41 +11,43 @@
 #include "stdafx.h"
 #include "Deeangband.h"
 
-#include "Air.h"
-#include "Ability.h"
-#include "Authority.h"
-#include "Building.h"
-#include "Camp.h"
-#include "CreatureTrait.h"
-
-class Creature;
-class Dungeon;
-class Effect;
-class Floor;
-
-#include "FixedArtifact.h"
-#include "GameMessage.h"
-#include "ItemBase.h"
-#include "ItemEgo.h"
-#include "ItemTrait.h"
-#include "Karma.h"
-#include "Lore.h"
-#include "Quest.h"
-#include "Race.h"
-#include "Space.h"
-#include "Skill.h"
-#include "Species.h"
-#include "StartingClass.h"
-#include "TrapBase.h"
-
-#include "Item.h"
-#include "Field.h"
-#include "Trap.h"
-
 BOOST_CLASS_VERSION(GameWorld, 1);
 
 namespace Deeangband
 {
+
+       class Air;
+       class Ability;
+       class Authority;
+       class Building;
+       class Camp;
+       class CreatureTrait;
+
+       class Creature;
+       class Dungeon;
+       class Effect;
+       class Floor;
+
+       class Field;
+       class FixedArtifact;
+       class GameMessage;
+       class Item;
+       class ItemBase;
+       class ItemEgo;
+       class ItemTrait;
+       class Karma;
+       class Lore;
+       class Quest;
+       class Race;
+       class Space;
+       class Skill;
+       class Species;
+       class StartingClass;
+       class Trap;
+       class TrapBase;
+
+       class Coordinates;
+
 #include "EngineTypedef.h"
 
        /*!