From b1be3596dc9e60330376c78415dc9c810c93dda1 Mon Sep 17 00:00:00 2001 From: Allofich Date: Fri, 17 Jun 2016 23:07:16 +0900 Subject: [PATCH] Cleanup of #include statements --- apps/openmw/mwmechanics/activespells.cpp | 1 - apps/openmw/mwmechanics/activespells.hpp | 6 +++--- apps/openmw/mwmechanics/actors.cpp | 4 ++-- apps/openmw/mwmechanics/actors.hpp | 3 ++- apps/openmw/mwmechanics/aiactivate.cpp | 3 +-- apps/openmw/mwmechanics/aiactivate.hpp | 1 + apps/openmw/mwmechanics/aiavoiddoor.cpp | 4 ++-- apps/openmw/mwmechanics/aiavoiddoor.hpp | 6 +++++- apps/openmw/mwmechanics/aicombat.cpp | 1 - apps/openmw/mwmechanics/aicombat.hpp | 9 ++++----- apps/openmw/mwmechanics/aicombataction.cpp | 10 +++++----- apps/openmw/mwmechanics/aicombataction.hpp | 4 ++-- apps/openmw/mwmechanics/aiescort.cpp | 3 +-- apps/openmw/mwmechanics/aiescort.hpp | 1 + apps/openmw/mwmechanics/aifollow.cpp | 3 ++- apps/openmw/mwmechanics/aifollow.hpp | 5 ++++- apps/openmw/mwmechanics/aipackage.cpp | 5 +++-- apps/openmw/mwmechanics/aipackage.hpp | 2 +- apps/openmw/mwmechanics/aipursue.cpp | 2 -- apps/openmw/mwmechanics/aisequence.cpp | 11 +++++------ apps/openmw/mwmechanics/aisequence.hpp | 1 - apps/openmw/mwmechanics/aiwander.hpp | 5 ++--- apps/openmw/mwmechanics/alchemy.cpp | 1 - apps/openmw/mwmechanics/character.cpp | 13 ++++++------- apps/openmw/mwmechanics/combat.cpp | 11 +++++------ apps/openmw/mwmechanics/difficultyscaling.cpp | 4 ++-- apps/openmw/mwmechanics/disease.hpp | 3 ++- apps/openmw/mwmechanics/enchanting.cpp | 1 + apps/openmw/mwmechanics/enchanting.hpp | 7 ++++++- apps/openmw/mwmechanics/levelledlist.hpp | 6 ++++-- apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 10 ++++------ apps/openmw/mwmechanics/objects.cpp | 4 ++-- apps/openmw/mwmechanics/pathfinding.cpp | 2 ++ apps/openmw/mwmechanics/pathfinding.hpp | 5 +++-- apps/openmw/mwmechanics/pathgrid.hpp | 3 ++- apps/openmw/mwmechanics/spellcasting.cpp | 1 - apps/openmw/mwmechanics/spellcasting.hpp | 4 ++-- apps/openmw/mwmechanics/summoning.cpp | 4 +--- apps/openmw/mwmechanics/summoning.hpp | 3 ++- apps/openmw/mwmechanics/trading.cpp | 4 ++-- 40 files changed, 92 insertions(+), 84 deletions(-) diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp index c98f7d829..52c05fdfa 100644 --- a/apps/openmw/mwmechanics/activespells.cpp +++ b/apps/openmw/mwmechanics/activespells.cpp @@ -1,7 +1,6 @@ #include "activespells.hpp" #include - #include #include diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp index 3842ee61c..0f1f803b7 100644 --- a/apps/openmw/mwmechanics/activespells.hpp +++ b/apps/openmw/mwmechanics/activespells.hpp @@ -5,13 +5,13 @@ #include #include +#include +#include + #include "../mwworld/timestamp.hpp" #include "magiceffects.hpp" -#include -#include - namespace MWMechanics { /// \brief Lasting spell effects diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index a1031f4c8..fa398950d 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -6,6 +6,7 @@ #include #include #include + #include #include "../mwworld/esmstore.hpp" @@ -22,8 +23,7 @@ #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/statemanager.hpp" -#include "../mwmechanics/spellcasting.hpp" - +#include "spellcasting.hpp" #include "npcstats.hpp" #include "creaturestats.hpp" #include "movement.hpp" diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp index 644864e7f..1db676b2a 100644 --- a/apps/openmw/mwmechanics/actors.hpp +++ b/apps/openmw/mwmechanics/actors.hpp @@ -7,9 +7,10 @@ #include #include -#include "movement.hpp" #include "../mwbase/world.hpp" +#include "movement.hpp" + namespace MWWorld { class Ptr; diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp index f6bb048cc..3c5504228 100644 --- a/apps/openmw/mwmechanics/aiactivate.cpp +++ b/apps/openmw/mwmechanics/aiactivate.cpp @@ -5,10 +5,9 @@ #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" -#include "../mwmechanics/creaturestats.hpp" - #include "../mwworld/class.hpp" +#include "creaturestats.hpp" #include "steering.hpp" #include "movement.hpp" diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp index 2ca985be9..8de4be69f 100644 --- a/apps/openmw/mwmechanics/aiactivate.hpp +++ b/apps/openmw/mwmechanics/aiactivate.hpp @@ -2,6 +2,7 @@ #define GAME_MWMECHANICS_AIACTIVATE_H #include "aipackage.hpp" + #include #include "pathfinding.hpp" diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp index 100b666e8..bb03ff53b 100644 --- a/apps/openmw/mwmechanics/aiavoiddoor.cpp +++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp @@ -3,12 +3,12 @@ #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" + #include "../mwworld/class.hpp" + #include "creaturestats.hpp" #include "movement.hpp" #include "actorutil.hpp" - - #include "steering.hpp" MWMechanics::AiAvoidDoor::AiAvoidDoor(const MWWorld::ConstPtr& doorPtr) diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp index 41c41b1f5..7344a1797 100644 --- a/apps/openmw/mwmechanics/aiavoiddoor.hpp +++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp @@ -2,11 +2,15 @@ #define GAME_MWMECHANICS_AIAVOIDDOOR_H #include "aipackage.hpp" + #include -#include "pathfinding.hpp" + #include + #include "../mwworld/class.hpp" +#include "pathfinding.hpp" + namespace MWMechanics { /// \brief AiPackage to have an actor avoid an opening door diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp index 196ef1c3f..87d744a60 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -16,7 +16,6 @@ #include "steering.hpp" #include "movement.hpp" #include "character.hpp" - #include "aicombataction.hpp" #include "combat.hpp" diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp index 2b364001f..1cfac5806 100644 --- a/apps/openmw/mwmechanics/aicombat.hpp +++ b/apps/openmw/mwmechanics/aicombat.hpp @@ -3,16 +3,15 @@ #include "aipackage.hpp" -#include "pathfinding.hpp" - -#include "movement.hpp" -#include "obstacle.hpp" +#include #include "../mwworld/cellstore.hpp" // for Doors #include "../mwbase/world.hpp" -#include +#include "pathfinding.hpp" +#include "movement.hpp" +#include "obstacle.hpp" namespace ESM { diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp index f62c34fc8..39c11c678 100644 --- a/apps/openmw/mwmechanics/aicombataction.cpp +++ b/apps/openmw/mwmechanics/aicombataction.cpp @@ -1,5 +1,8 @@ #include "aicombataction.hpp" +#include +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" @@ -8,11 +11,8 @@ #include "../mwworld/inventorystore.hpp" #include "../mwworld/actionequip.hpp" -#include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/spellcasting.hpp" - -#include -#include +#include "npcstats.hpp" +#include "spellcasting.hpp" namespace { diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp index 6f5cbfbc2..bc635ceb2 100644 --- a/apps/openmw/mwmechanics/aicombataction.hpp +++ b/apps/openmw/mwmechanics/aicombataction.hpp @@ -3,11 +3,11 @@ #include +#include + #include "../mwworld/ptr.hpp" #include "../mwworld/containerstore.hpp" -#include - namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp index 03532cbae..2d7b8b9f6 100644 --- a/apps/openmw/mwmechanics/aiescort.cpp +++ b/apps/openmw/mwmechanics/aiescort.cpp @@ -10,8 +10,7 @@ #include "../mwworld/class.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwmechanics/creaturestats.hpp" - +#include "creaturestats.hpp" #include "steering.hpp" #include "movement.hpp" diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp index dcb136ca4..719582271 100644 --- a/apps/openmw/mwmechanics/aiescort.hpp +++ b/apps/openmw/mwmechanics/aiescort.hpp @@ -2,6 +2,7 @@ #define GAME_MWMECHANICS_AIESCORT_H #include "aipackage.hpp" + #include #include "pathfinding.hpp" diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp index dd2219c45..1b843f850 100644 --- a/apps/openmw/mwmechanics/aifollow.cpp +++ b/apps/openmw/mwmechanics/aifollow.cpp @@ -6,11 +6,12 @@ #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" + #include "../mwworld/class.hpp" #include "../mwworld/cellstore.hpp" + #include "creaturestats.hpp" #include "movement.hpp" - #include "steering.hpp" namespace MWMechanics diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp index 719909ebc..e46205b95 100644 --- a/apps/openmw/mwmechanics/aifollow.hpp +++ b/apps/openmw/mwmechanics/aifollow.hpp @@ -2,10 +2,13 @@ #define GAME_MWMECHANICS_AIFOLLOW_H #include "aipackage.hpp" + #include -#include "pathfinding.hpp" + #include +#include "pathfinding.hpp" + namespace ESM { namespace AiSequence diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp index aefb39f6b..dc23f922c 100644 --- a/apps/openmw/mwmechanics/aipackage.cpp +++ b/apps/openmw/mwmechanics/aipackage.cpp @@ -8,12 +8,13 @@ #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" + +#include "../mwworld/action.hpp" #include "../mwworld/class.hpp" #include "../mwworld/cellstore.hpp" + #include "creaturestats.hpp" #include "movement.hpp" -#include "../mwworld/action.hpp" - #include "steering.hpp" #include "actorutil.hpp" #include "coordinateconverter.hpp" diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp index fb862189d..8f6ddb111 100644 --- a/apps/openmw/mwmechanics/aipackage.hpp +++ b/apps/openmw/mwmechanics/aipackage.hpp @@ -1,9 +1,9 @@ #ifndef GAME_MWMECHANICS_AIPACKAGE_H #define GAME_MWMECHANICS_AIPACKAGE_H -#include "pathfinding.hpp" #include +#include "pathfinding.hpp" #include "obstacle.hpp" #include "aistate.hpp" diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp index 055801fde..be16f49a2 100644 --- a/apps/openmw/mwmechanics/aipursue.cpp +++ b/apps/openmw/mwmechanics/aipursue.cpp @@ -8,8 +8,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/action.hpp" -#include "../mwmechanics/creaturestats.hpp" - #include "movement.hpp" #include "creaturestats.hpp" diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp index 412df3742..ed9db102f 100644 --- a/apps/openmw/mwmechanics/aisequence.cpp +++ b/apps/openmw/mwmechanics/aisequence.cpp @@ -2,9 +2,13 @@ #include +#include + +#include "../mwbase/environment.hpp" +#include "../mwbase/world.hpp" + #include "aipackage.hpp" #include "aistate.hpp" - #include "aiwander.hpp" #include "aiescort.hpp" #include "aitravel.hpp" @@ -14,11 +18,6 @@ #include "aipursue.hpp" #include "actorutil.hpp" -#include - -#include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" - namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp index 0c200c26b..c7c32979e 100644 --- a/apps/openmw/mwmechanics/aisequence.hpp +++ b/apps/openmw/mwmechanics/aisequence.hpp @@ -4,7 +4,6 @@ #include #include -//#include "aistate.hpp" namespace MWWorld { diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp index d652d4799..64a54a66b 100644 --- a/apps/openmw/mwmechanics/aiwander.hpp +++ b/apps/openmw/mwmechanics/aiwander.hpp @@ -5,11 +5,10 @@ #include -#include "pathfinding.hpp" -#include "obstacle.hpp" - #include "../mwworld/timestamp.hpp" +#include "pathfinding.hpp" +#include "obstacle.hpp" #include "aistate.hpp" namespace ESM diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp index d02376d23..322d59280 100644 --- a/apps/openmw/mwmechanics/alchemy.cpp +++ b/apps/openmw/mwmechanics/alchemy.cpp @@ -15,7 +15,6 @@ #include #include - #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index c20153206..0b1c96186 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -21,13 +21,6 @@ #include - -#include "movement.hpp" -#include "npcstats.hpp" -#include "creaturestats.hpp" -#include "security.hpp" -#include "actorutil.hpp" - #include #include @@ -46,6 +39,12 @@ #include "../mwworld/esmstore.hpp" #include "../mwworld/player.hpp" +#include "movement.hpp" +#include "npcstats.hpp" +#include "creaturestats.hpp" +#include "security.hpp" +#include "actorutil.hpp" + namespace { diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp index 8d9d4cb3a..df2793bcb 100644 --- a/apps/openmw/mwmechanics/combat.cpp +++ b/apps/openmw/mwmechanics/combat.cpp @@ -8,17 +8,16 @@ #include "../mwbase/world.hpp" #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/soundmanager.hpp" - -#include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/movement.hpp" -#include "../mwmechanics/spellcasting.hpp" -#include "../mwmechanics/difficultyscaling.hpp" +#include "../mwbase/windowmanager.hpp" #include "../mwworld/class.hpp" #include "../mwworld/inventorystore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwbase/windowmanager.hpp" +#include "npcstats.hpp" +#include "movement.hpp" +#include "spellcasting.hpp" +#include "difficultyscaling.hpp" #include "actorutil.hpp" namespace diff --git a/apps/openmw/mwmechanics/difficultyscaling.cpp b/apps/openmw/mwmechanics/difficultyscaling.cpp index 950fe33cf..693587eda 100644 --- a/apps/openmw/mwmechanics/difficultyscaling.cpp +++ b/apps/openmw/mwmechanics/difficultyscaling.cpp @@ -1,11 +1,11 @@ #include "difficultyscaling.hpp" +#include + #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" #include "../mwworld/esmstore.hpp" -#include - #include "actorutil.hpp" float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim) diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp index 25bde56ab..5746af2a2 100644 --- a/apps/openmw/mwmechanics/disease.hpp +++ b/apps/openmw/mwmechanics/disease.hpp @@ -6,14 +6,15 @@ #include "../mwbase/windowmanager.hpp" #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" + #include "../mwworld/ptr.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" + #include "spells.hpp" #include "creaturestats.hpp" #include "actorutil.hpp" - namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp index 102e3787a..57ece6a79 100644 --- a/apps/openmw/mwmechanics/enchanting.cpp +++ b/apps/openmw/mwmechanics/enchanting.cpp @@ -6,6 +6,7 @@ #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" #include "../mwworld/esmstore.hpp" + #include "../mwbase/mechanicsmanager.hpp" #include "creaturestats.hpp" diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp index 2c05d2d2e..a53027bb9 100644 --- a/apps/openmw/mwmechanics/enchanting.hpp +++ b/apps/openmw/mwmechanics/enchanting.hpp @@ -1,10 +1,15 @@ #ifndef GAME_MWMECHANICS_ENCHANTING_H #define GAME_MWMECHANICS_ENCHANTING_H + #include -#include "../mwworld/ptr.hpp" + #include + +#include "../mwworld/ptr.hpp" + #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" + namespace MWMechanics { class Enchanting diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp index edfef5358..fb06d8935 100644 --- a/apps/openmw/mwmechanics/levelledlist.hpp +++ b/apps/openmw/mwmechanics/levelledlist.hpp @@ -1,16 +1,18 @@ #ifndef OPENMW_MECHANICS_LEVELLEDLIST_H #define OPENMW_MECHANICS_LEVELLEDLIST_H -#include - #include +#include + #include "../mwworld/ptr.hpp" #include "../mwworld/esmstore.hpp" #include "../mwworld/manualref.hpp" #include "../mwworld/class.hpp" + #include "../mwbase/world.hpp" #include "../mwbase/environment.hpp" + #include "creaturestats.hpp" #include "actorutil.hpp" diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp index 6dd14be11..a7623d7cf 100644 --- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp +++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp @@ -11,18 +11,16 @@ #include "../mwworld/esmstore.hpp" #include "../mwworld/inventorystore.hpp" +#include "../mwworld/class.hpp" +#include "../mwworld/player.hpp" #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" #include "../mwbase/windowmanager.hpp" #include "../mwbase/dialoguemanager.hpp" -#include "../mwworld/class.hpp" -#include "../mwworld/player.hpp" - -#include "../mwmechanics/aicombat.hpp" -#include "../mwmechanics/aipursue.hpp" - +#include "aicombat.hpp" +#include "aipursue.hpp" #include "spellcasting.hpp" #include "autocalcspell.hpp" #include "npcstats.hpp" diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp index 94b552a38..7d7c0bfae 100644 --- a/apps/openmw/mwmechanics/objects.cpp +++ b/apps/openmw/mwmechanics/objects.cpp @@ -2,11 +2,11 @@ #include -#include "movement.hpp" - #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" +#include "movement.hpp" + namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp index c8ba86703..51127de2a 100644 --- a/apps/openmw/mwmechanics/pathfinding.cpp +++ b/apps/openmw/mwmechanics/pathfinding.cpp @@ -1,4 +1,5 @@ #include "pathfinding.hpp" + #include #include "../mwbase/world.hpp" @@ -6,6 +7,7 @@ #include "../mwworld/esmstore.hpp" #include "../mwworld/cellstore.hpp" + #include "coordinateconverter.hpp" namespace diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp index 7262842dc..00a8fe0e4 100644 --- a/apps/openmw/mwmechanics/pathfinding.hpp +++ b/apps/openmw/mwmechanics/pathfinding.hpp @@ -1,11 +1,12 @@ #ifndef GAME_MWMECHANICS_PATHFINDING_H #define GAME_MWMECHANICS_PATHFINDING_H -#include -#include #include #include +#include +#include + namespace MWWorld { class CellStore; diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp index 67fbacded..ab418ae78 100644 --- a/apps/openmw/mwmechanics/pathgrid.hpp +++ b/apps/openmw/mwmechanics/pathgrid.hpp @@ -1,9 +1,10 @@ #ifndef GAME_MWMECHANICS_PATHGRID_H #define GAME_MWMECHANICS_PATHGRID_H -#include #include +#include + namespace ESM { struct Cell; diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index 842951362..4059702d3 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -19,7 +19,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" - #include "../mwworld/inventorystore.hpp" #include "../mwrender/animation.hpp" diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp index 5bc618058..ae20a39d0 100644 --- a/apps/openmw/mwmechanics/spellcasting.hpp +++ b/apps/openmw/mwmechanics/spellcasting.hpp @@ -1,10 +1,10 @@ #ifndef MWMECHANICS_SPELLSUCCESS_H #define MWMECHANICS_SPELLSUCCESS_H -#include "../mwworld/ptr.hpp" - #include +#include "../mwworld/ptr.hpp" + namespace ESM { struct Spell; diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp index 9b094ba32..3ff8cf667 100644 --- a/apps/openmw/mwmechanics/summoning.cpp +++ b/apps/openmw/mwmechanics/summoning.cpp @@ -6,8 +6,6 @@ #include "../mwbase/world.hpp" #include "../mwbase/mechanicsmanager.hpp" -#include "../mwmechanics/spellcasting.hpp" - #include "../mwworld/esmstore.hpp" #include "../mwworld/class.hpp" #include "../mwworld/manualref.hpp" @@ -15,10 +13,10 @@ #include "../mwrender/animation.hpp" +#include "spellcasting.hpp" #include "creaturestats.hpp" #include "aifollow.hpp" - namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp index 3a60e2b68..b2a3c60ea 100644 --- a/apps/openmw/mwmechanics/summoning.hpp +++ b/apps/openmw/mwmechanics/summoning.hpp @@ -3,9 +3,10 @@ #include -#include "magiceffects.hpp" #include "../mwworld/ptr.hpp" +#include "magiceffects.hpp" + namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp index c4ef5103e..469b454df 100644 --- a/apps/openmw/mwmechanics/trading.cpp +++ b/apps/openmw/mwmechanics/trading.cpp @@ -6,11 +6,11 @@ #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/world.hpp" -#include "../mwmechanics/creaturestats.hpp" - #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" +#include "creaturestats.hpp" + namespace MWMechanics { Trading::Trading() {}