From 092a2dd175a4001a495c84ee85211734fb928c83 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Wed, 2 Jan 2013 22:47:43 +0100 Subject: [PATCH] removed lazy fwd headers --- l2e.cbp | 8 ------- src/app/Application.cpp | 1 + src/app/Application.h | 9 ++++++-- src/app/State.h | 6 ++++- src/app/fwd.h | 19 ---------------- src/battle/BattleState.cpp | 1 + src/battle/BattleState.h | 17 +++++++++----- src/battle/Capsule.cpp | 1 + src/battle/Capsule.h | 8 +++++-- src/battle/Hero.cpp | 1 + src/battle/Hero.h | 12 ++++++---- src/battle/HeroTag.h | 14 ++++++++---- src/battle/Monster.cpp | 1 + src/battle/Monster.h | 10 +++++++-- src/battle/NumberAnimation.h | 10 +++++++-- src/battle/Resources.h | 11 +++++++-- src/battle/SmallHeroTag.cpp | 1 + src/battle/SmallHeroTag.h | 10 ++++++--- src/battle/fwd.h | 31 -------------------------- src/battle/states/RunState.h | 10 +++++++-- src/battle/states/SelectAttackType.cpp | 1 + src/battle/states/SelectAttackType.h | 10 +++++++-- src/battle/states/SelectIkari.cpp | 1 + src/battle/states/SelectIkari.h | 11 +++++++-- src/battle/states/SelectItem.cpp | 1 + src/battle/states/SelectItem.h | 11 +++++++-- src/battle/states/SelectMoveAction.cpp | 1 + src/battle/states/SelectMoveAction.h | 10 +++++++-- src/battle/states/SelectSpell.cpp | 1 + src/battle/states/SelectSpell.h | 11 +++++++-- src/battle/states/SelectTarget.cpp | 1 + src/battle/states/SelectTarget.h | 16 ++++++++++--- src/battle/states/SwapHeroes.cpp | 1 + src/battle/states/SwapHeroes.h | 11 +++++++-- src/common/GameConfig.h | 13 ++++++++--- src/common/Hero.h | 11 +++++++-- src/common/Inventory.h | 4 +++- src/common/Item.h | 10 +++++++-- src/common/ScriptHost.h | 5 ++++- src/common/ScriptRunner.h | 5 ++++- src/common/fwd.h | 22 ------------------ src/graphics/Menu.h | 1 - src/graphics/fwd.h | 25 --------------------- src/loader/Caster.h | 22 ++++++++++++++---- src/loader/Interpreter.cpp | 1 + src/loader/Interpreter.h | 8 ------- src/loader/ParsedSource.h | 6 ++++- src/loader/Parser.cpp | 3 +++ src/loader/Parser.h | 11 +++++++-- src/loader/fwd.h | 23 ------------------- src/map/Area.cpp | 1 + src/map/Area.h | 9 ++++++-- src/map/Entity.h | 12 +++++++--- src/map/Map.cpp | 1 + src/map/Map.h | 13 ++++++++--- src/map/MapState.h | 10 +++++++-- src/map/TransitionState.cpp | 1 + src/map/TransitionState.h | 11 +++++++-- src/map/Trigger.cpp | 1 + src/map/Trigger.h | 6 +++-- src/map/fwd.h | 16 ------------- src/math/fwd.h | 15 ------------- src/menu/CapsuleChangeMenu.cpp | 1 + src/menu/CapsuleChangeMenu.h | 14 +++++++++--- src/menu/CapsuleFeedMenu.cpp | 1 + src/menu/CapsuleFeedMenu.h | 15 ++++++++++--- src/menu/CapsuleMenu.cpp | 1 + src/menu/CapsuleMenu.h | 16 ++++++++++--- src/menu/CapsuleNameMenu.cpp | 1 + src/menu/CapsuleNameMenu.h | 14 +++++++++--- src/menu/ChangeHero.cpp | 1 + src/menu/ChangeHero.h | 10 +++++++-- src/menu/ConfigMenu.cpp | 1 + src/menu/ConfigMenu.h | 10 +++++++-- src/menu/EquipMenu.cpp | 1 + src/menu/EquipMenu.h | 15 ++++++++++--- src/menu/HeroStatus.h | 9 ++++++-- src/menu/InventoryMenu.cpp | 1 + src/menu/InventoryMenu.h | 14 +++++++++--- src/menu/PartyMenu.h | 9 ++++++-- src/menu/Resources.h | 9 +++++++- src/menu/ScenarioMenu.cpp | 1 + src/menu/ScenarioMenu.h | 14 +++++++++--- src/menu/SelectHero.h | 10 +++++++-- src/menu/SpellMenu.cpp | 1 + src/menu/SpellMenu.h | 15 ++++++++++--- src/menu/StatusMenu.cpp | 1 + src/menu/StatusMenu.h | 15 ++++++++++--- src/menu/fwd.h | 24 -------------------- 89 files changed, 453 insertions(+), 305 deletions(-) delete mode 100644 src/app/fwd.h delete mode 100644 src/battle/fwd.h delete mode 100644 src/common/fwd.h delete mode 100644 src/graphics/fwd.h delete mode 100644 src/loader/fwd.h delete mode 100644 src/map/fwd.h delete mode 100644 src/math/fwd.h delete mode 100644 src/menu/fwd.h diff --git a/l2e.cbp b/l2e.cbp index d072ddd..690a9bf 100644 --- a/l2e.cbp +++ b/l2e.cbp @@ -61,7 +61,6 @@ - @@ -88,7 +87,6 @@ - @@ -132,7 +130,6 @@ - @@ -158,7 +155,6 @@ - @@ -173,7 +169,6 @@ - @@ -191,10 +186,8 @@ - - @@ -226,7 +219,6 @@ - diff --git a/src/app/Application.cpp b/src/app/Application.cpp index 76d98ef..64a8602 100644 --- 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 diff --git a/src/app/Application.h b/src/app/Application.h index 62d9740..e29bc63 100644 --- 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 #include diff --git a/src/app/State.h b/src/app/State.h index 0b8d51f..58538fa 100644 --- 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 diff --git a/src/app/fwd.h b/src/app/fwd.h deleted file mode 100644 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 -struct TimerData; -template -class Timer; -template -class Timers; - -} - -#endif /* APP_FWD_H_ */ diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index cfac62d..66097fb 100644 --- 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 #include diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index d242371..c0f706e 100644 --- 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 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 diff --git a/src/battle/Capsule.cpp b/src/battle/Capsule.cpp index ef85ae1..316dd14 100644 --- 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 diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h index 8f268e1..80edd47 100644 --- a/src/battle/Capsule.h +++ b/src/battle/Capsule.h @@ -4,14 +4,18 @@ namespace common { class Capsule; } +namespace math { + template + 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 + namespace battle { class Capsule { diff --git a/src/battle/Hero.cpp b/src/battle/Hero.cpp index 7dd8abb..d09b824 100644 --- 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 da2c866..0d2ce0e 100644 --- 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 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 diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h index 24c8f8a..d6ef82d 100644 --- 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 Vector; +} #include diff --git a/src/battle/Monster.cpp b/src/battle/Monster.cpp index 0088c79..a252e5f 100644 --- 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 bb44bb4..6aaf1f4 100644 --- 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 diff --git a/src/battle/NumberAnimation.h b/src/battle/NumberAnimation.h index dea8bfc..698a5f1 100644 --- 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 Vector; +} + #include "../graphics/Animation.h" namespace battle { diff --git a/src/battle/Resources.h b/src/battle/Resources.h index 72f3afb..99ad9fc 100644 --- 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 diff --git a/src/battle/SmallHeroTag.cpp b/src/battle/SmallHeroTag.cpp index 1496d47..c6f8daf 100644 --- 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 7c03801..7ab47e6 100644 --- 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 Vector; +} #include diff --git a/src/battle/fwd.h b/src/battle/fwd.h deleted file mode 100644 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 f21280e..9a3a856 100644 --- 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 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 0dd5bc4..f4a107e 100644 --- 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 diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h index c8f6e99..3290666 100644 --- 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 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 4b8c5b8..53d2cbd 100644 --- 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 e665c69..060a812 100644 --- 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 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 acebefa..85ea773 100644 --- 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 2bf4d59..6562b69 100644 --- 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 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 b77f98c..2ec5822 100644 --- 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 0e973d4..66f3642 100644 --- 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 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 8c0c4da..ae7f278 100644 --- 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 8ad19f1..03401c6 100644 --- 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 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 a0955b2..c685dab 100644 --- 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 8970260..121b8ad 100644 --- 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 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 da2342b..c9fad2d 100644 --- 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 7ebf3f5..81fe774 100644 --- 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 Vector; +} + #include "../../app/State.h" -#include "../../math/Vector.h" namespace battle { diff --git a/src/common/GameConfig.h b/src/common/GameConfig.h index 4da5ff3..a3158e7 100644 --- 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 623e2c4..7014331 100644 --- 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 diff --git a/src/common/Inventory.h b/src/common/Inventory.h index bb8f599..5e21721 100644 --- 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 diff --git a/src/common/Item.h b/src/common/Item.h index 2fbcbba..bacdfb0 100644 --- 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 diff --git a/src/common/ScriptHost.h b/src/common/ScriptHost.h index 2dd4619..8d5910d 100644 --- 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 67931c1..2a6b0de 100644 --- 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 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 91cc3a7..ac98646 100644 --- 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 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 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 31ce612..3420f67 100644 --- 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 diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp index 46b4bc3..cb15a03 100644 --- 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 5707959..5f66c0f 100644 --- 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 #include diff --git a/src/loader/ParsedSource.h b/src/loader/ParsedSource.h index c843de1..28aca13 100644 --- 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 #include diff --git a/src/loader/Parser.cpp b/src/loader/Parser.cpp index 3f5f344..89e3931 100644 --- a/src/loader/Parser.cpp +++ b/src/loader/Parser.cpp @@ -1,9 +1,12 @@ #include "Parser.h" +#include "ParsedSource.h" #include "utility.h" #include #include +#include +#include using std::auto_ptr; using std::ifstream; diff --git a/src/loader/Parser.h b/src/loader/Parser.h index 75cd5fe..addb9da 100644 --- 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 diff --git a/src/loader/fwd.h b/src/loader/fwd.h deleted file mode 100644 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 2c7f1b8..e7d6f66 100644 --- 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 diff --git a/src/map/Area.h b/src/map/Area.h index 90f8f5f..6ea5837 100644 --- 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 diff --git a/src/map/Entity.h b/src/map/Entity.h index d68861c..64a319d 100644 --- 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 diff --git a/src/map/Map.cpp b/src/map/Map.cpp index 823847c..682f4f2 100644 --- 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 diff --git a/src/map/Map.h b/src/map/Map.h index 595e62b..101689f 100644 --- 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 Vector; +} + #include "Entity.h" -#include "fwd.h" -#include "../math/Vector.h" -#include "../graphics/fwd.h" #include diff --git a/src/map/MapState.h b/src/map/MapState.h index 89d235d..f0f20c1 100644 --- 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 cb26df5..97712cd 100644 --- 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 293cdb2..965da8a 100644 --- 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 Vector; +} + #include "../app/State.h" -#include "../math/Vector.h" namespace map { diff --git a/src/map/Trigger.cpp b/src/map/Trigger.cpp index 7a279a8..cb65ae6 100644 --- 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 024b1f2..3baf74a 100644 --- 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 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 index 618c8cc..0000000 --- a/src/math/fwd.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef MATH_FWD_H_ -#define MATH_FWD_H_ - -#include - -namespace math { - -template -class Fixed; -template -class Vector; - -} - -#endif /* MATH_FWD_H_ */ diff --git a/src/menu/CapsuleChangeMenu.cpp b/src/menu/CapsuleChangeMenu.cpp index c19f0f5..3897cb6 100644 --- 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 2667595..bd12601 100644 --- 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 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 085c73d..07808f6 100644 --- 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 5d8fbe6..91b2cc1 100644 --- 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 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 e50215c..6b2eeeb 100644 --- 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 0ddb2e8..c42eb49 100644 --- 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 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 0dc21cc..423652f 100644 --- 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 diff --git a/src/menu/CapsuleNameMenu.h b/src/menu/CapsuleNameMenu.h index 4630c0a..4bc4d01 100644 --- 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 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 69f79c4..98ce7aa 100644 --- 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 diff --git a/src/menu/ChangeHero.h b/src/menu/ChangeHero.h index c046af3..1d87ab1 100644 --- 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 Vector; +} +namespace menu { + class PartyMenu; +} + #include "../app/State.h" -#include "../math/Vector.h" #include diff --git a/src/menu/ConfigMenu.cpp b/src/menu/ConfigMenu.cpp index 8445e82..274f30a 100644 --- 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 cdee9fc..e8b2692 100644 --- 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 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 8e50966..d04d2f4 100644 --- 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 992afd7..a0ead61 100644 --- 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 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 e24cb6c..fbe21ab 100644 --- 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 diff --git a/src/menu/InventoryMenu.cpp b/src/menu/InventoryMenu.cpp index 9a4bf13..a288171 100644 --- 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 780bacb..0668cda 100644 --- 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 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 934369e..409ee16 100644 --- 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 1790a27..656827e 100644 --- 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 92c5101..18fa55a 100644 --- 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 886046c..7f10367 100644 --- 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 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 8f7f9f4..9548045 100644 --- 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 diff --git a/src/menu/SpellMenu.cpp b/src/menu/SpellMenu.cpp index 09ca56c..5f12573 100644 --- 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 #include diff --git a/src/menu/SpellMenu.h b/src/menu/SpellMenu.h index 4bfcb01..8ad86f3 100644 --- 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 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 49695dc..41f848f 100644 --- 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 6ef8189..8c139a3 100644 --- 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 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 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_ */ -- 2.39.2