removed lazy fwd headers

diff --git a/l2e.cbp b/l2e.cbp
index d072ddd749e7e24a74c18a7949b985024a30118d..690a9bf3f0bb5f087692ff0a4a4c70bc00f90ede 100644 (file)
--- a/l2e.cbp
+++ b/l2e.cbp
@@ -61,7 +61,6 @@
                <Unit filename="src\app\State.cpp" />
                <Unit filename="src\app\State.h" />
                <Unit filename="src\app\Timer.h" />
-               <Unit filename="src\app\fwd.h" />
                <Unit filename="src\battle\AttackChoice.cpp" />
                <Unit filename="src\battle\AttackChoice.h" />
                <Unit filename="src\battle\AttackTypeMenu.cpp" />
@@ -88,7 +87,6 @@
                <Unit filename="src\battle\SmallHeroTag.h" />
                <Unit filename="src\battle\TargetSelection.cpp" />
                <Unit filename="src\battle\TargetSelection.h" />
-               <Unit filename="src\battle\fwd.h" />
                <Unit filename="src\battle\states\PerformAttacks.cpp" />
                <Unit filename="src\battle\states\PerformAttacks.h" />
                <Unit filename="src\battle\states\RunState.cpp" />
@@ -132,7 +130,6 @@
                <Unit filename="src\common\Stats.h" />
                <Unit filename="src\common\TargetingMode.cpp" />
                <Unit filename="src\common\TargetingMode.h" />
-               <Unit filename="src\common\fwd.h" />
                <Unit filename="src\graphics\Animation.cpp" />
                <Unit filename="src\graphics\Animation.h" />
                <Unit filename="src\graphics\Camera.cpp" />
@@ -158,7 +155,6 @@
                <Unit filename="src\graphics\Sprite.h" />
                <Unit filename="src\graphics\Texture.cpp" />
                <Unit filename="src\graphics\Texture.h" />
-               <Unit filename="src\graphics\fwd.h" />
                <Unit filename="src\loader\Caster.cpp" />
                <Unit filename="src\loader\Caster.h" />
                <Unit filename="src\loader\Interpreter.cpp" />
@@ -173,7 +169,6 @@
                <Unit filename="src\loader\Tokenizer.h" />
                <Unit filename="src\loader\TypeDescription.cpp" />
                <Unit filename="src\loader\TypeDescription.h" />
-               <Unit filename="src\loader\fwd.h" />
                <Unit filename="src\loader\utility.cpp" />
                <Unit filename="src\loader\utility.h" />
                <Unit filename="src\main.cpp" />
@@ -191,10 +186,8 @@
                <Unit filename="src\map\TransitionState.h" />
                <Unit filename="src\map\Trigger.cpp" />
                <Unit filename="src\map\Trigger.h" />
-               <Unit filename="src\map\fwd.h" />
                <Unit filename="src\math\Fixed.h" />
                <Unit filename="src\math\Vector.h" />
-               <Unit filename="src\math\fwd.h" />
                <Unit filename="src\math\utility.h" />
                <Unit filename="src\menu\CapsuleChangeMenu.cpp" />
                <Unit filename="src\menu\CapsuleChangeMenu.h" />
@@ -226,7 +219,6 @@
                <Unit filename="src\menu\SpellMenu.h" />
                <Unit filename="src\menu\StatusMenu.cpp" />
                <Unit filename="src\menu\StatusMenu.h" />
-               <Unit filename="src\menu\fwd.h" />
                <Unit filename="src\sdl\InitImage.cpp" />
                <Unit filename="src\sdl\InitImage.h" />
                <Unit filename="src\sdl\InitSDL.cpp" />

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 76d98efc7fbc2609053391f7b7894693523a6c9f..64a8602e8d9b1c551bd2940224c3a1ab72746292 100644 (file)
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -1,6 +1,7 @@
 #include "Application.h"
 
 #include "State.h"
+#include "../sdl/InitScreen.h"
 
 #include <cassert>
 

diff --git a/src/app/Application.h b/src/app/Application.h
index 62d9740b943aa41107d78c32f704671f427a9392..e29bc63feb885e613efea2fd998565d48803c144 100644 (file)
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -1,10 +1,15 @@
 #ifndef APP_APPLICATION_H_
 #define APP_APPLICATION_H_
 
-#include "fwd.h"
+namespace app {
+       class State;
+}
+namespace sdl {
+       class InitScreen;
+}
+
 #include "Input.h"
 #include "Timer.h"
-#include "../sdl/InitScreen.h"
 
 #include <stack>
 #include <queue>

diff --git a/src/app/State.h b/src/app/State.h
index 0b8d51f628a846deacd1f4ce67e6ff6160f93c04..58538faf99c70f33dd6b16c5b66dfb6a63cb3845 100644 (file)
--- a/src/app/State.h
+++ b/src/app/State.h
@@ -1,7 +1,11 @@
 #ifndef APP_APPLICATIONSTATE_H_
 #define APP_APPLICATIONSTATE_H_
 
-#include "fwd.h"
+namespace app {
+       class Application;
+       class Input;
+}
+
 #include "Timer.h"
 
 #include <SDL.h>

diff --git a/src/app/fwd.h b/src/app/fwd.h
deleted file mode 100644 (file)
index 60932a4..0000000
--- a/src/app/fwd.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_FWD_H_
-#define APP_FWD_H_
-
-namespace app {
-
-class Application;
-class Arguments;
-class Input;
-class State;
-template<class Time>
-struct TimerData;
-template<class Time>
-class Timer;
-template<class Time>
-class Timers;
-
-}
-
-#endif /* APP_FWD_H_ */

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index cfac62d0b1fb0f655ffc33f5db678886990da882..66097fbd46d05a8d5315196fb161fef1bc5a34cb 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -12,6 +12,7 @@
 #include "../common/Spell.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Sprite.h"
+#include "../math/Vector.h"
 
 #include <algorithm>
 #include <cassert>

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index d2423719e04c5d035f7e6273c5a68c687315ec94..c0f706e8db0852da9f9d8267bc3f41f7b44dd729 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -1,7 +1,18 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
-#include "fwd.h"
+namespace battle {
+       class PartyLayout;
+}
+namespace common {
+       class Item;
+       struct GameConfig;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "AttackTypeMenu.h"
 #include "Capsule.h"
 #include "Hero.h"
@@ -10,14 +21,10 @@
 #include "MoveMenu.h"
 #include "Resources.h"
 #include "SmallHeroTag.h"
-#include "../app/fwd.h"
 #include "../app/State.h"
 #include "../common/GameConfig.h"
-#include "../common/fwd.h"
 #include "../common/Stats.h"
-#include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <cassert>

diff --git a/src/battle/Capsule.cpp b/src/battle/Capsule.cpp
index ef85ae17b22a88a45a52b6f42bd6aba6356754cd..316dd140fc98dae9019d8c333043e290fd09c266 100644 (file)
--- a/src/battle/Capsule.cpp
+++ b/src/battle/Capsule.cpp
@@ -1,6 +1,7 @@
 #include "Capsule.h"
 
 #include "../common/Capsule.h"
+#include "../math/Vector.h"
 
 #include <cassert>
 

diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h
index 8f268e18f4e74dc863b07e6b8550ce4fb33a84d0..80edd47fbd1d514a6357ab2f8c1b39c85075b9e6 100644 (file)
--- a/src/battle/Capsule.h
+++ b/src/battle/Capsule.h
@@ -4,14 +4,18 @@
 namespace common {
        class Capsule;
 }
+namespace math {
+       template<class>
+       class Vector;
+}
 
 #include "AttackChoice.h"
 #include "../common/Stats.h"
-#include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
+#include <SDL.h>
+
 namespace battle {
 
 class Capsule {

diff --git a/src/battle/Hero.cpp b/src/battle/Hero.cpp
index 7dd8abb26d453d40277cee55307eed744a8665e0..d09b824d4961f5edb5fc397ec90740de8eae86dd 100644 (file)
--- a/src/battle/Hero.cpp
+++ b/src/battle/Hero.cpp
@@ -5,6 +5,7 @@
 #include "../common/Ikari.h"
 #include "../common/Item.h"
 #include "../common/Spell.h"
+#include "../math/Vector.h"
 
 using common::Ikari;
 using common::Spell;

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index da2c86662de617210c982357f41bb1c00a618bad..0d2ce0ede1d9e9f7ebccc56cadfce6f790350d3f 100644 (file)
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -1,14 +1,18 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
-#include "fwd.h"
+namespace battle {
+       struct Resources;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "AttackChoice.h"
-#include "../common/fwd.h"
 #include "../common/Hero.h"
 #include "../common/Stats.h"
-#include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <vector>

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 24c8f8a6da4109c4e564023d9f1211cd83e98a0b..d6ef82d349e88a25cbb504a7c0f8a39a1ae7ba37 100644 (file)
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -1,10 +1,16 @@
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
-#include "fwd.h"
-#include "Hero.h"
-#include "../math/Vector.h"
-#include "../graphics/fwd.h"
+namespace battle {
+       class BattleState;
+}
+namespace graphics {
+       class Sprite;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
 
 #include <SDL.h>
 

diff --git a/src/battle/Monster.cpp b/src/battle/Monster.cpp
index 0088c7935856f817ebdd05015f287635c46c6be7..a252e5f4e5084c2823ef8cf7019177e660be2b37 100644 (file)
--- a/src/battle/Monster.cpp
+++ b/src/battle/Monster.cpp
@@ -5,6 +5,7 @@
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
+#include "../math/Vector.h"
 
 using common::Stats;
 using graphics::Animation;

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index bb44bb48ed2ce525b4612811ab49790f683e5868..6aaf1f46164e96a182dd1b7fe1f602a4c5b2248b 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -1,12 +1,18 @@
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+namespace common {
+       class Item;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
 #include "AttackChoice.h"
-#include "../common/fwd.h"
 #include "../common/Stats.h"
 #include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 
 #include <SDL.h>
 

diff --git a/src/battle/NumberAnimation.h b/src/battle/NumberAnimation.h
index dea8bfcecc018ad7285e0f55edaefde8782d29fa..698a5f18b754c9aa93d13ba8a527a0f6c3d69ebc 100644 (file)
--- a/src/battle/NumberAnimation.h
+++ b/src/battle/NumberAnimation.h
@@ -1,8 +1,14 @@
 #ifndef BATTLE_NUMBERANIMATION_H_
 #define BATTLE_NUMBERANIMATION_H_
 
-#include "../app/fwd.h"
-#include "../math/Vector.h"
+namespace app {
+       class State;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../graphics/Animation.h"
 
 namespace battle {

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 72f3afb0ce193b96769b08f3fd0abfe05807f4e0..99ad9fc13ee5e9ab2ac7f5e131c6b43ad50bbcf7 100644 (file)
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -1,9 +1,16 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
-#include "../common/fwd.h"
+namespace graphics {
+       class Animation;
+       class Font;
+       class Frame;
+       class Gauge;
+       struct MenuProperties;
+       class Sprite;
+}
+
 #include "../graphics/Color.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <SDL.h>

diff --git a/src/battle/SmallHeroTag.cpp b/src/battle/SmallHeroTag.cpp
index 1496d47f3c336c836069eb4158f1669f2f714315..c6f8dafa4a3a1a71aebf9b71228c59087a17cd97 100644 (file)
--- a/src/battle/SmallHeroTag.cpp
+++ b/src/battle/SmallHeroTag.cpp
@@ -5,6 +5,7 @@
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Gauge.h"
+#include "../math/Vector.h"
 
 using math::Vector;
 using graphics::Font;

diff --git a/src/battle/SmallHeroTag.h b/src/battle/SmallHeroTag.h
index 7c038017fab49d156ba60083010e9eeba3fed86a..7ab47e611a3f5771647d0ae7f15f5a89547acbc3 100644 (file)
--- a/src/battle/SmallHeroTag.h
+++ b/src/battle/SmallHeroTag.h
@@ -1,9 +1,13 @@
 #ifndef BATTLE_SMALLHEROTAG_H_
 #define BATTLE_SMALLHEROTAG_H_
 
-#include "fwd.h"
-#include "../math/Vector.h"
-#include "../graphics/fwd.h"
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
 
 #include <SDL.h>
 

diff --git a/src/battle/fwd.h b/src/battle/fwd.h
deleted file mode 100644 (file)
index 959b856..0000000
--- a/src/battle/fwd.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef BATTLE_FWD_H_
-#define BATTLE_FWD_H_
-
-namespace battle {
-
-class AttackChoice;
-class AttackTypeMenu;
-class BattleState;
-class Capsule;
-class Hero;
-class HeroTag;
-class Monster;
-class MoveMenu;
-class NumberAnimation;
-class PartyLayout;
-class PerformAttacks;
-struct Resources;
-class RunState;
-class SelectAttackType;
-class SelectIkari;
-class SelectItem;
-class SelectMoveAction;
-class SelectSpell;
-class SelectTarget;
-class SmallHeroTag;
-class SwapHeroes;
-class TargetSelection;
-
-}
-
-#endif /* BATTLE_FWD_H_ */

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index f21280ee224a21ef1cbe6b7f470fddc4dfdb9453..9a3a85608c47aa08d25d18e814189cd93e36b5f7 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -8,9 +8,15 @@
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 0dd5bc472a4aff0177dbd15ccb244a0d026d0ceb..f4a107e881afcd1f9e4f52bafa0acc4b1a9861f8 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -17,6 +17,7 @@
 #include "../../app/Application.h"
 #include "../../app/Input.h"
 #include "../../common/Item.h"
+#include "../../math/Vector.h"
 
 #include <stdexcept>
 

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index c8f6e99604775092ffe4c0998fd8b2faa6e29fd0..3290666b3d0d33855a5beaca925279749ab6b77d 100644 (file)
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -8,9 +8,15 @@
 #ifndef BATTLE_SELECTATTACKTYPE_H_
 #define BATTLE_SELECTATTACKTYPE_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 4b8c5b8d0e529ab7f18a371312b13af5913a67ba..53d2cbd462dc479578861f5a5a48d8966f101e5e 100644 (file)
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -15,6 +15,7 @@
 #include "../../common/Ikari.h"
 #include "../../common/Item.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index e665c696c22cb1240630e9b644be0b3c2cf0ce31..060a8124d693abac6677d21a7e4d106d11f470ec 100644 (file)
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -8,9 +8,16 @@
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+       class SelectAttackType;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index acebefa2796f25e0901c34869780b2772838e34f..85ea773ce4d2420ecbbb2ecdf223585f44497358 100644 (file)
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -14,6 +14,7 @@
 #include "../../app/Input.h"
 #include "../../common/Item.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index 2bf4d594327af5aa0f574a5d6831ad928dc5825a..6562b694edb6ca74e0c069400a9fcda731c7754b 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -8,9 +8,16 @@
 #ifndef BATTLE_SELECTITEM_H_
 #define BATTLE_SELECTITEM_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+       class SelectAttackType;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index b77f98c1a2459a7da7aa9e80bfb590542f6a89cc..2ec582214c6262d266a4cd22b452c053bfa0f48d 100644 (file)
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -14,6 +14,7 @@
 #include "../MoveMenu.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index 0e973d4751c2e3698c9d1e8fc5a15bab6cdb74ca..66f3642c096ecb2e68af538ffd88249e329683b6 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -8,9 +8,15 @@
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 8c0c4da5687110eb1cf3ae574a2e0bf2ccc5ee64..ae7f278a232c7d25d48929a3c8f845dc8dee8b54 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -15,6 +15,7 @@
 #include "../../app/Input.h"
 #include "../../common/Spell.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index 8ad19f1410b09e58e03fab4b59a9f35f1bd154e4..03401c6bcbefef7557025059e4ec4f61b587ba5d 100644 (file)
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -8,9 +8,16 @@
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+       class SelectAttackType;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SelectTarget.cpp b/src/battle/states/SelectTarget.cpp
index a0955b2691d477bb7fbd779a2c4f43b587055cda..c685dab8947108aa78b83d0a794fdac07da6fba9 100644 (file)
--- a/src/battle/states/SelectTarget.cpp
+++ b/src/battle/states/SelectTarget.cpp
@@ -11,6 +11,7 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index 8970260042030ea2fff4520e881e63fda3c9e07d..121b8ad235f72638aef1c60698d3255e6921a87b 100644 (file)
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -8,10 +8,20 @@
 #ifndef BATTLE_SELECTTARGET_H_
 #define BATTLE_SELECTTARGET_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+       class SelectAttackType;
+       class TargetSelection;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace graphics {
+       class Sprite;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
-#include "../../graphics/fwd.h"
 
 namespace battle {
 

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index da2342b14bcffd3e7f60e1842135a6e4effd7623..c9fad2dbbbb4501452200c3bd039e890ca046763 100644 (file)
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -11,6 +11,7 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 7ebf3f59229d5e14f52c04ed24c3189bd3cd823d..81fe774689d05a36ff2be87232f62f5e14d0d625 100644 (file)
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -8,9 +8,16 @@
 #ifndef BATTLE_SWAPHEROES_H_
 #define BATTLE_SWAPHEROES_H_
 
-#include "../fwd.h"
+namespace battle {
+       class BattleState;
+       class SelectMoveAction;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../math/Vector.h"
 
 namespace battle {
 

diff --git a/src/common/GameConfig.h b/src/common/GameConfig.h
index 4da5ff36a9812a3cfcde615324539bc6479020cd..a3158e71222b4505a62fefa5a667c270899a9c1c 100644 (file)
--- a/src/common/GameConfig.h
+++ b/src/common/GameConfig.h
@@ -1,9 +1,16 @@
 #ifndef COMMON_GAMECONFIG_H_
 #define COMMON_GAMECONFIG_H_
 
-#include "fwd.h"
-#include "../battle/fwd.h"
-#include "../menu/fwd.h"
+namespace battle {
+       class PartyLayout;
+       struct Resources;
+}
+namespace common {
+       struct GameState;
+}
+namespace menu {
+       struct Resources;
+}
 
 namespace common {
 

diff --git a/src/common/Hero.h b/src/common/Hero.h
index 623e2c4965fabbaaadc45efb3dbd3e47a7dd6149..7014331b844b6cad7586edf7cc9bc1c5c7b08464 100644 (file)
--- a/src/common/Hero.h
+++ b/src/common/Hero.h
@@ -1,9 +1,16 @@
 #ifndef COMMON_HERO_H_
 #define COMMON_HERO_H_
 
-#include "fwd.h"
+namespace common {
+       class Item;
+       class Spell;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
 #include "Stats.h"
-#include "../graphics/fwd.h"
 #include "../map/Entity.h"
 
 #include <vector>

diff --git a/src/common/Inventory.h b/src/common/Inventory.h
index bb8f59964913d2f33e1c07e40e905a083e9e577d..5e21721d5d1a0804bd5186ef1d2952d2668a80d7 100644 (file)
--- a/src/common/Inventory.h
+++ b/src/common/Inventory.h
@@ -1,7 +1,9 @@
 #ifndef COMMON_INVENTORY_H_
 #define COMMON_INVENTORY_H_
 
-#include "fwd.h"
+namespace common {
+       class Item;
+}
 
 #include <SDL.h>
 

diff --git a/src/common/Item.h b/src/common/Item.h
index 2fbcbba2648892aa552936f76ffb21df37d12d39..bacdfb090614f37956062327d27a1e75f58a25c7 100644 (file)
--- a/src/common/Item.h
+++ b/src/common/Item.h
@@ -1,10 +1,16 @@
 #ifndef COMMON_ITEM_H_
 #define COMMON_ITEM_H_
 
-#include "fwd.h"
+namespace common {
+       class Ikari;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
 #include "Hero.h"
 #include "TargetingMode.h"
-#include "../graphics/fwd.h"
 
 #include <SDL.h>
 

diff --git a/src/common/ScriptHost.h b/src/common/ScriptHost.h
index 2dd461904d73806c13ec642bd18bef7508f50e98..8d5910dce4aed3f21c82b94a6db20c5378ca4610 100644 (file)
--- a/src/common/ScriptHost.h
+++ b/src/common/ScriptHost.h
@@ -1,7 +1,10 @@
 #ifndef COMMON_SCRIPTHOST_H_
 #define COMMON_SCRIPTHOST_H_
 
-#include "fwd.h"
+namespace common {
+       class ScriptRunner;
+}
+
 
 namespace common {
 

diff --git a/src/common/ScriptRunner.h b/src/common/ScriptRunner.h
index 67931c1323f18f49a6e802b54c7c79586ba3a613..2a6b0de18fb880aad53dd956210e1cad2c3bce50 100644 (file)
--- a/src/common/ScriptRunner.h
+++ b/src/common/ScriptRunner.h
@@ -1,7 +1,10 @@
 #ifndef COMMON_SCRIPTRUNNER_H_
 #define COMMON_SCRIPTRUNNER_H_
 
-#include "fwd.h"
+namespace common {
+       class ScriptHost;
+}
+
 #include "Script.h"
 #include "../math/Vector.h"
 

diff --git a/src/common/fwd.h b/src/common/fwd.h
deleted file mode 100644 (file)
index 209eaa1..0000000
--- a/src/common/fwd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COMMON_FWD_H_
-#define COMMON_FWD_H_
-
-namespace common {
-
-class Capsule;
-struct GameConfig;
-struct GameState;
-class Hero;
-class Ikari;
-class Inventory;
-class Item;
-class Script;
-class ScriptHost;
-class ScriptRunner;
-class Spell;
-class Stats;
-class TargetingMode;
-
-}
-
-#endif /* COMMON_FWD_H_ */

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 91cc3a7cbbe6431a7021a4611c82dd59c54eb255..ac986466c8be2408b87542d54b837c00f2294dc1 100644 (file)
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -2,7 +2,6 @@
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
-#include "fwd.h"
 #include "Sprite.h"
 #include "../math/Vector.h"
 

diff --git a/src/graphics/fwd.h b/src/graphics/fwd.h
deleted file mode 100644 (file)
index 6b3bf43..0000000
--- a/src/graphics/fwd.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef GRAPHICS_FWD_H_
-#define GRAPHICS_FWD_H_
-
-namespace graphics {
-
-class Animation;
-class AnimationRunner;
-class Camera;
-class CharSelect;
-class Color;
-class ColorFade;
-class ComplexAnimation;
-class Font;
-class Frame;
-class Gauge;
-template<class T>
-class Menu;
-struct MenuProperties;
-class SimpleAnimation;
-class Sprite;
-class Texture;
-
-}
-
-#endif /* GRAPHICS_FWD_H_ */

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 31ce61226677f40f8d32645bbf1d861e6680f3bf..3420f67984f5df0a83502742005a5635b1442371 100644 (file)
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,11 +1,25 @@
 #ifndef LOADER_CASTER_H_
 #define LOADER_CASTER_H_
 
+namespace battle {
+       struct Resources;
+       class Monster;
+       class PartyLayout;
+}
+namespace common {
+       class Capsule;
+       class Hero;
+       class Item;
+       class Spell;
+}
+namespace map {
+       class Map;
+}
+namespace menu {
+       struct Resources;
+}
+
 #include "Interpreter.h"
-#include "../battle/fwd.h"
-#include "../common/fwd.h"
-#include "../map/fwd.h"
-#include "../menu/fwd.h"
 
 #include <string>
 

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 46b4bc35198f5e337329a8dc71710c5157e1d3ce..cb15a035185512b8127d6a1206850a46b0a6fe01 100644 (file)
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -1,6 +1,7 @@
 #include "Interpreter.h"
 
 #include "ParsedSource.h"
+#include "TypeDescription.h"
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
 #include "../battle/PartyLayout.h"

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index 5707959e49265d52b66ecd075ac64d569b7dc44c..5f66c0f954e55243f018eb9065783359801e206b 100644 (file)
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -1,17 +1,9 @@
 #ifndef LOADER_INTERPRETER_H_
 #define LOADER_INTERPRETER_H_
 
-#include "fwd.h"
 #include "PagedAllocator.h"
 #include "ParsedSource.h"
-#include "TypeDescription.h"
-#include "../battle/fwd.h"
-#include "../common/fwd.h"
 #include "../common/Script.h"
-#include "../math/Vector.h"
-#include "../graphics/Color.h"
-#include "../graphics/ComplexAnimation.h"
-#include "../graphics/fwd.h"
 
 #include <map>
 #include <set>

diff --git a/src/loader/ParsedSource.h b/src/loader/ParsedSource.h
index c843de1889add9c37d22247ced22477533c37af1..28aca131d0d4afccd4e9ad282e592f36e7a3f316 100644 (file)
--- a/src/loader/ParsedSource.h
+++ b/src/loader/ParsedSource.h
@@ -1,7 +1,11 @@
 #ifndef LOADER_PARSEDSOURCE_H_
 #define LOADER_PARSEDSOURCE_H_
 
-#include "fwd.h"
+namespace loader {
+       class Literal;
+       class PropertyList;
+       class Value;
+}
 
 #include <iosfwd>
 #include <map>

diff --git a/src/loader/Parser.cpp b/src/loader/Parser.cpp
index 3f5f3446955ab8d78005912ad1d31df432c658e8..89e3931e9529ccdf2dd4ce3c6a5fae6544a1cd35 100644 (file)
--- a/src/loader/Parser.cpp
+++ b/src/loader/Parser.cpp
@@ -1,9 +1,12 @@
 #include "Parser.h"
 
+#include "ParsedSource.h"
 #include "utility.h"
 
 #include <auto_ptr.h>
 #include <fstream>
+#include <string>
+#include <vector>
 
 using std::auto_ptr;
 using std::ifstream;

diff --git a/src/loader/Parser.h b/src/loader/Parser.h
index 75cd5fec48740fe0bbf59638572dc7f3c852ee19..addb9dacac525b072f385c9896fa30efe55c4ddd 100644 (file)
--- a/src/loader/Parser.h
+++ b/src/loader/Parser.h
@@ -1,8 +1,15 @@
 #ifndef LOADER_PARSER_H_
 #define LOADER_PARSER_H_
 
-#include "fwd.h"
-#include "ParsedSource.h"
+namespace loader {
+       class Definition;
+       class Declaration;
+       class Literal;
+       class ParsedSource;
+       class PropertyList;
+       class Value;
+}
+
 #include "Tokenizer.h"
 
 #include <fstream>

diff --git a/src/loader/fwd.h b/src/loader/fwd.h
deleted file mode 100644 (file)
index 2b51911..0000000
--- a/src/loader/fwd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef LOADER_FWD_H_
-#define LOADER_FWD_H_
-
-namespace loader {
-
-class Caster;
-class Declaration;
-class Definition;
-class FieldDescription;
-class Interpreter;
-class Literal;
-class PagedAllocator;
-class ParsedSource;
-class Parser;
-class PropertyList;
-class ScriptToken;
-class Tokenizer;
-class TypeDescription;
-class Value;
-
-}
-
-#endif /* LOADER_FWD_H_ */

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 2c7f1b8b7987d50fc477b7b8f5c3af501899344b..e7d6f6635d8b284f7945bc2c5c2729238ccefbef 100644 (file)
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -4,6 +4,7 @@
 #include "../graphics/Sprite.h"
 #include "../loader/TypeDescription.h"
 #include "../loader/Interpreter.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>

diff --git a/src/map/Area.h b/src/map/Area.h
index 90f8f5fc7b3eaf0ab2b322882b1dfa5ff7ee33dc..6ea58374cee518584f8d7c8915a22f8e0ac62c05 100644 (file)
--- a/src/map/Area.h
+++ b/src/map/Area.h
@@ -1,9 +1,14 @@
 #ifndef MAP_AREA_H_
 #define MAP_AREA_H_
 
-#include "fwd.h"
+namespace graphics {
+       class Sprite;
+}
+namespace map {
+       class Tile;
+}
+
 #include "../math/Vector.h"
-#include "../graphics/Sprite.h"
 
 #include <SDL.h>
 

diff --git a/src/map/Entity.h b/src/map/Entity.h
index d68861c7a60c5a7006aefe234abd39d26d3af294..64a319dc623051c1b1447df8d38e928f16568c8b 100644 (file)
--- a/src/map/Entity.h
+++ b/src/map/Entity.h
@@ -1,11 +1,17 @@
 #ifndef MAP_ENTITY_H_
 #define MAP_ENTITY_H_
 
-#include "../battle/fwd.h"
-#include "../battle/Monster.h"
+namespace app {
+       class Application;
+       class State;
+}
+namespace battle {
+       class Monster;
+       class PartyLayout;
+}
+
 #include "../math/Fixed.h"
 #include "../math/Vector.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Animation.h"
 
 #include <functional>

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 823847c92213eae625b86469ded3b80ba38a5084..682f4f2a8a7f6a43a68cb300db0e7abf36cb2edd 100644 (file)
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -6,6 +6,7 @@
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>

diff --git a/src/map/Map.h b/src/map/Map.h
index 595e62b35c5926bb6776b516195d8517d575759b..101689f72c43f9ecece1748100f90b9aa4bfc5ed 100644 (file)
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -1,10 +1,17 @@
 #ifndef MAP_MAP_H_
 #define MAP_MAP_H_
 
+namespace map {
+       class Area;
+       class Tile;
+       class Trigger;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "Entity.h"
-#include "fwd.h"
-#include "../math/Vector.h"
-#include "../graphics/fwd.h"
 
 #include <SDL.h>
 

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 89d235ddd631e22e0e99e93ac0d9d1b43031f950..f0f20c1ccf635379a1b0778272232e5be7840556 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,10 +1,16 @@
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
+namespace common {
+       struct GameConfig;
+}
+namespace map {
+       class Map;
+       class Trigger;
+}
+
 #include "Entity.h"
-#include "fwd.h"
 #include "../app/State.h"
-#include "../common/fwd.h"
 #include "../common/ScriptHost.h"
 #include "../common/ScriptRunner.h"
 #include "../math/Fixed.h"

diff --git a/src/map/TransitionState.cpp b/src/map/TransitionState.cpp
index cb26df5a3052b2a5d8470d7e941f3c0dae7572b5..97712cdf32a15a3302bd7db15cef52aa65b020fe 100644 (file)
--- a/src/map/TransitionState.cpp
+++ b/src/map/TransitionState.cpp
@@ -2,6 +2,7 @@
 
 #include "MapState.h"
 #include "../app/Application.h"
+#include "../math/Vector.h"
 
 using app::Application;
 using app::State;

diff --git a/src/map/TransitionState.h b/src/map/TransitionState.h
index 293cdb2cf906bdd57f5e368253113d68bdf74057..965da8a29f2929697d45d3033c0171ffcb33c86b 100644 (file)
--- a/src/map/TransitionState.h
+++ b/src/map/TransitionState.h
@@ -1,9 +1,16 @@
 #ifndef MAP_TRANSITIONSTATE_H_
 #define MAP_TRANSITIONSTATE_H_
 
-#include "fwd.h"
+namespace map {
+       class Map;
+       class MapState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../app/State.h"
-#include "../math/Vector.h"
 
 namespace map {
 

diff --git a/src/map/Trigger.cpp b/src/map/Trigger.cpp
index 7a279a8f3e2e5389e2d9bb1e1a8943745fb5302c..cb65ae641cb3766a309d46d31cc9b4a9c7937a95 100644 (file)
--- a/src/map/Trigger.cpp
+++ b/src/map/Trigger.cpp
@@ -1,5 +1,6 @@
 #include "Trigger.h"
 
+#include "../common/Script.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 

diff --git a/src/map/Trigger.h b/src/map/Trigger.h
index 024b1f210e57b8714d7a67751951ef207d2fd64a..3baf74a960b8b7badf96727766782fdee5b9c237 100644 (file)
--- a/src/map/Trigger.h
+++ b/src/map/Trigger.h
@@ -1,9 +1,11 @@
 #ifndef MAP_TRIGGER_H_
 #define MAP_TRIGGER_H_
 
+namespace common {
+       class Script;
+}
+
 #include "Entity.h"
-#include "fwd.h"
-#include "../common/Script.h"
 #include "../math/Vector.h"
 
 namespace map {

diff --git a/src/map/fwd.h b/src/map/fwd.h
deleted file mode 100644 (file)
index dab2dc5..0000000
--- a/src/map/fwd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MAP_FWD_H_
-#define MAP_FWD_H_
-
-namespace map {
-
-class Area;
-class Entity;
-class Map;
-class MapState;
-class Tile;
-class TransitionState;
-class Trigger;
-
-}
-
-#endif /* MAP_FWD_H_ */

diff --git a/src/math/fwd.h b/src/math/fwd.h
deleted file mode 100644 (file)
index 618c8cc..0000000
--- a/src/math/fwd.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef MATH_FWD_H_
-#define MATH_FWD_H_
-
-#include <SDL.h>
-
-namespace math {
-
-template<Uint8 fracBits>
-class Fixed;
-template<class Scalar>
-class Vector;
-
-}
-
-#endif /* MATH_FWD_H_ */

diff --git a/src/menu/CapsuleChangeMenu.cpp b/src/menu/CapsuleChangeMenu.cpp
index c19f0f599ce8802329b7d1b661cf666e7eeff5f7..3897cb696679a689abe4c254cef6c3bb193256e3 100644 (file)
--- a/src/menu/CapsuleChangeMenu.cpp
+++ b/src/menu/CapsuleChangeMenu.cpp
@@ -11,6 +11,7 @@
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Texture.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Capsule;

diff --git a/src/menu/CapsuleChangeMenu.h b/src/menu/CapsuleChangeMenu.h
index 2667595aeb573813680a58e20f9d4a2ca2b874c6..bd126011536d051d37a13d30b7d0522dd935d130 100644 (file)
--- a/src/menu/CapsuleChangeMenu.h
+++ b/src/menu/CapsuleChangeMenu.h
@@ -1,10 +1,18 @@
 #ifndef MENU_CAPSULECHANGEMENU_H_
 #define MENU_CAPSULECHANGEMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Capsule;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class CapsuleMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 
 namespace menu {
 

diff --git a/src/menu/CapsuleFeedMenu.cpp b/src/menu/CapsuleFeedMenu.cpp
index 085c73d29d06c7cb883ac009f584d408bc743cb4..07808f65b49b8f9a34b031eb07ad6ad777cc6ab4 100644 (file)
--- a/src/menu/CapsuleFeedMenu.cpp
+++ b/src/menu/CapsuleFeedMenu.cpp
@@ -10,6 +10,7 @@
 #include "../common/GameState.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Capsule;

diff --git a/src/menu/CapsuleFeedMenu.h b/src/menu/CapsuleFeedMenu.h
index 5d8fbe6e73b1a6451f8c0a6a6b655105dee5224a..91b2cc11242979f2a2114d471ac459702325d260 100644 (file)
--- a/src/menu/CapsuleFeedMenu.h
+++ b/src/menu/CapsuleFeedMenu.h
@@ -1,10 +1,19 @@
 #ifndef MENU_CAPSULEFEEDMENU_H_
 #define MENU_CAPSULEFEEDMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Capsule;
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class CapsuleMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/CapsuleMenu.cpp b/src/menu/CapsuleMenu.cpp
index e50215ce34979cc628853a9225d55d31c160f637..6b2eeeb1da1194da8674754a8b7ffbe8358453c3 100644 (file)
--- a/src/menu/CapsuleMenu.cpp
+++ b/src/menu/CapsuleMenu.cpp
@@ -14,6 +14,7 @@
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Texture.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Capsule;

diff --git a/src/menu/CapsuleMenu.h b/src/menu/CapsuleMenu.h
index 0ddb2e874a8e4e65ca2758f0137e30e8c0ee1111..c42eb4952c3d631e1c8080d21c872315825432af 100644 (file)
--- a/src/menu/CapsuleMenu.h
+++ b/src/menu/CapsuleMenu.h
@@ -1,10 +1,20 @@
 #ifndef MENU_CAPSULEMENU_H_
 #define MENU_CAPSULEMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Capsule;
+       struct GameConfig;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+       struct Resources;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/CapsuleNameMenu.cpp b/src/menu/CapsuleNameMenu.cpp
index 0dc21cc597a5c38c794ce2ab5f4a4e28f76ac1d9..423652feaa5e10add83719dacf6ccb028d638e9d 100644 (file)
--- a/src/menu/CapsuleNameMenu.cpp
+++ b/src/menu/CapsuleNameMenu.cpp
@@ -10,6 +10,7 @@
 #include "../common/GameState.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 #include <cstring>
 

diff --git a/src/menu/CapsuleNameMenu.h b/src/menu/CapsuleNameMenu.h
index 4630c0acf4f6fde4527fda449a9e53f100c8276e..4bc4d011ddf37c2c09ef75ba80589ca3d3e01748 100644 (file)
--- a/src/menu/CapsuleNameMenu.h
+++ b/src/menu/CapsuleNameMenu.h
@@ -1,10 +1,18 @@
 #ifndef MENU_CAPSULENAMEMENU_H_
 #define MENU_CAPSULENAMEMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Capsule;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class CapsuleMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/CharSelect.h"
 
 namespace menu {

diff --git a/src/menu/ChangeHero.cpp b/src/menu/ChangeHero.cpp
index 69f79c4429647af911ce5f2e1fb4fa071a9a5e0d..98ce7aa996a852c49de5d2bdcc00b507ff06a55a 100644 (file)
--- a/src/menu/ChangeHero.cpp
+++ b/src/menu/ChangeHero.cpp
@@ -8,6 +8,7 @@
 #include "../app/Input.h"
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
+#include "../math/Vector.h"
 
 #include <algorithm>
 

diff --git a/src/menu/ChangeHero.h b/src/menu/ChangeHero.h
index c046af30fa4bcd0fce1356cd5b460b16941431d0..1d87ab183d08e51e5ecbb15829a8e971d1328b7a 100644 (file)
--- a/src/menu/ChangeHero.h
+++ b/src/menu/ChangeHero.h
@@ -1,9 +1,15 @@
 #ifndef MENU_CHANGEHERO_H_
 #define MENU_CHANGEHERO_H_
 
-#include "fwd.h"
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../math/Vector.h"
 
 #include <SDL.h>
 

diff --git a/src/menu/ConfigMenu.cpp b/src/menu/ConfigMenu.cpp
index 8445e82cce78ec811b6d7797b9b9f98affe4ce30..274f30a1d80bc6ee593e4d20e7e4c683200411dc 100644 (file)
--- a/src/menu/ConfigMenu.cpp
+++ b/src/menu/ConfigMenu.cpp
@@ -8,6 +8,7 @@
 #include "../common/GameState.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::GameState;

diff --git a/src/menu/ConfigMenu.h b/src/menu/ConfigMenu.h
index cdee9fc376ee35ab04f0dafb90902a789882f34e..e8b2692c3d982843adde46d4717dc8468d2fb047 100644 (file)
--- a/src/menu/ConfigMenu.h
+++ b/src/menu/ConfigMenu.h
@@ -1,9 +1,15 @@
 #ifndef MENU_CONFIGMENU_H_
 #define MENU_CONFIGMENU_H_
 
-#include "fwd.h"
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/EquipMenu.cpp b/src/menu/EquipMenu.cpp
index 8e509660ee302a81b50e457712dfbb3c60581fd0..d04d2f4315ee99e68dbc387d68c737fe98ec6e9b 100644 (file)
--- a/src/menu/EquipMenu.cpp
+++ b/src/menu/EquipMenu.cpp
@@ -13,6 +13,7 @@
 #include "../common/Stats.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Hero;

diff --git a/src/menu/EquipMenu.h b/src/menu/EquipMenu.h
index 992afd793de4897f27b1eee950b7328fbd07b5a0..a0ead613c7c09f165f2d225728b629400e288ff8 100644 (file)
--- a/src/menu/EquipMenu.h
+++ b/src/menu/EquipMenu.h
@@ -1,10 +1,19 @@
 #ifndef MENU_EQUIPMENU_H_
 #define MENU_EQUIPMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Hero;
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/HeroStatus.h b/src/menu/HeroStatus.h
index e24cb6c0db3e6b9e2633f4ec18ed500f7830b3ef..fbe21abb5b52aace4183d8241afa439d1ea0c673 100644 (file)
--- a/src/menu/HeroStatus.h
+++ b/src/menu/HeroStatus.h
@@ -1,8 +1,13 @@
 #ifndef MENU_HEROSTATUS_H_
 #define MENU_HEROSTATUS_H_
 
-#include "fwd.h"
-#include "../common/fwd.h"
+namespace common {
+       class Hero;
+}
+namespace menu {
+       struct Resources;
+}
+
 #include "../math/Vector.h"
 
 #include <SDL.h>

diff --git a/src/menu/InventoryMenu.cpp b/src/menu/InventoryMenu.cpp
index 9a4bf13e7ab0efc9db6afa3f6262da0618960bb8..a2881719f717caff55f0f6d4ca315846ec228543 100644 (file)
--- a/src/menu/InventoryMenu.cpp
+++ b/src/menu/InventoryMenu.cpp
@@ -10,6 +10,7 @@
 #include "../common/Item.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Inventory;

diff --git a/src/menu/InventoryMenu.h b/src/menu/InventoryMenu.h
index 780bacb7725294dc278ae7ab1316bd0dbfdf75bd..0668cda1bb7b86c9bc7c648f8438f02886627ec2 100644 (file)
--- a/src/menu/InventoryMenu.h
+++ b/src/menu/InventoryMenu.h
@@ -1,10 +1,18 @@
 #ifndef MENU_INVENTORYMENU_H_
 #define MENU_INVENTORYMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/PartyMenu.h b/src/menu/PartyMenu.h
index 934369e121499d6e7ba09025b36bf978844339f5..409ee16ccf672e77c07c671f33d478cc58717a5f 100644 (file)
--- a/src/menu/PartyMenu.h
+++ b/src/menu/PartyMenu.h
@@ -1,10 +1,15 @@
 #ifndef MENU_PARTYMENU_H_
 #define MENU_PARTYMENU_H_
 
-#include "fwd.h"
+namespace common {
+       struct GameConfig;
+}
+namespace menu {
+       struct Resources;
+}
+
 #include "HeroStatus.h"
 #include "../app/State.h"
-#include "../common/fwd.h"
 #include "../math/Vector.h"
 #include "../graphics/Menu.h"
 

diff --git a/src/menu/Resources.h b/src/menu/Resources.h
index 1790a2777c8ee0f371327081c0be0e7ba0918a83..656827e8f54a08b7b307d58fd40516d852c9c57b 100644 (file)
--- a/src/menu/Resources.h
+++ b/src/menu/Resources.h
@@ -1,7 +1,14 @@
 #ifndef MENU_RESOURCES_H_
 #define MENU_RESOURCES_H_
 
-#include "../graphics/fwd.h"
+namespace graphics {
+       class CharSelect;
+       class Font;
+       class Frame;
+       struct MenuProperties;
+       class Sprite;
+       class Texture;
+}
 
 namespace menu {
 

diff --git a/src/menu/ScenarioMenu.cpp b/src/menu/ScenarioMenu.cpp
index 92c510128faf68ed9f0eb4e72a8b20d08e742545..18fa55a984291177f65ada647b8bbbfa8686fbaf 100644 (file)
--- a/src/menu/ScenarioMenu.cpp
+++ b/src/menu/ScenarioMenu.cpp
@@ -10,6 +10,7 @@
 #include "../common/Item.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Inventory;

diff --git a/src/menu/ScenarioMenu.h b/src/menu/ScenarioMenu.h
index 886046c8ed8946b65589f4139a04a6b2b6979d43..7f1036741eb0755bad2b0477d7a5e8ed72b2e791 100644 (file)
--- a/src/menu/ScenarioMenu.h
+++ b/src/menu/ScenarioMenu.h
@@ -1,10 +1,18 @@
 #ifndef MENU_SCENARIOMENU_H_
 #define MENU_SCENARIOMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/SelectHero.h b/src/menu/SelectHero.h
index 8f7f9f4a4882f5b505802b2a9b9f5b21ce2762d6..9548045f1f6a148beb3168e951bbd470dba828d2 100644 (file)
--- a/src/menu/SelectHero.h
+++ b/src/menu/SelectHero.h
@@ -1,10 +1,16 @@
 #ifndef MENU_SELECTHERO_H_
 #define MENU_SELECTHERO_H_
 
-#include "fwd.h"
+namespace common {
+       struct GameConfig;
+}
+namespace menu {
+       class PartyMenu;
+       struct Resources;
+}
+
 #include "../app/State.h"
 #include "../app/Timer.h"
-#include "../common/fwd.h"
 
 #include <SDL.h>
 

diff --git a/src/menu/SpellMenu.cpp b/src/menu/SpellMenu.cpp
index 09ca56ca53faa8c88fc28b2c0c971d31ea491964..5f125733a58c8dcd8496f19fb32b666121df4b16 100644 (file)
--- a/src/menu/SpellMenu.cpp
+++ b/src/menu/SpellMenu.cpp
@@ -11,6 +11,7 @@
 #include "../common/Spell.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 #include <algorithm>
 #include <SDL.h>

diff --git a/src/menu/SpellMenu.h b/src/menu/SpellMenu.h
index 4bfcb015200ce8d8d33d2ceeb95c78c6b1c7d2e0..8ad86f398625bd82f2be951a39e5bf44cd1ae36f 100644 (file)
--- a/src/menu/SpellMenu.h
+++ b/src/menu/SpellMenu.h
@@ -1,10 +1,19 @@
 #ifndef MENU_SPELLMENU_H_
 #define MENU_SPELLMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Hero;
+       class Spell;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index 49695dc48f6e2313a9fd90c7a583c9550127fdd0..41f848f82dde590cf55c6c872e7cd4469b1ccc7f 100644 (file)
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -12,6 +12,7 @@
 #include "../common/Stats.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Hero;

diff --git a/src/menu/StatusMenu.h b/src/menu/StatusMenu.h
index 6ef81898c1b3da60f37d9f1d72febc70c54fff3c..8c139a3a6e61291e9f46da09175f49452fe428f0 100644 (file)
--- a/src/menu/StatusMenu.h
+++ b/src/menu/StatusMenu.h
@@ -1,10 +1,19 @@
 #ifndef MENU_STATUSMENU_H_
 #define MENU_STATUSMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Hero;
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {

diff --git a/src/menu/fwd.h b/src/menu/fwd.h
deleted file mode 100644 (file)
index 59322d1..0000000
--- a/src/menu/fwd.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef MENU_FWD_H_
-#define MENU_FWD_H_
-
-namespace menu {
-
-class CapsuleChangeMenu;
-class CapsuleFeedMenu;
-class CapsuleMenu;
-class CapsuleNameMenu;
-class ChangeHero;
-class ConfigMenu;
-class EquipMenu;
-class HeroStatus;
-class InventoryMenu;
-class PartyMenu;
-struct Resources;
-class ScenarioMenu;
-class SelectHero;
-class SpellMenu;
-class StatusMenu;
-
-}
-
-#endif /* MENU_FWD_H_ */