From a66c095ec369e0bda5de2a38ed7aa473c963b07a Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 17 Aug 2022 19:16:01 +0200 Subject: [PATCH] Cleanup openmw class and mechanics includes --- apps/openmw/mwclass/apparatus.cpp | 2 -- apps/openmw/mwclass/armor.cpp | 2 -- apps/openmw/mwclass/book.cpp | 2 -- apps/openmw/mwclass/clothing.cpp | 2 -- apps/openmw/mwclass/creature.cpp | 1 - apps/openmw/mwclass/door.cpp | 2 +- apps/openmw/mwclass/ingredient.cpp | 2 -- apps/openmw/mwclass/lockpick.cpp | 2 -- apps/openmw/mwclass/misc.cpp | 1 - apps/openmw/mwclass/potion.cpp | 3 --- apps/openmw/mwclass/probe.cpp | 2 -- apps/openmw/mwclass/repair.cpp | 1 - apps/openmw/mwclass/weapon.cpp | 2 -- apps/openmw/mwmechanics/activespells.hpp | 1 - apps/openmw/mwmechanics/aiactivate.hpp | 2 -- apps/openmw/mwmechanics/aiavoiddoor.hpp | 4 ---- apps/openmw/mwmechanics/aicombat.cpp | 2 ++ apps/openmw/mwmechanics/aicombat.hpp | 3 --- apps/openmw/mwmechanics/aiwander.hpp | 1 - apps/openmw/mwmechanics/character.cpp | 1 + apps/openmw/mwmechanics/character.hpp | 5 ++--- apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 1 - apps/openmw/mwmechanics/setbaseaisetting.hpp | 1 - apps/openmw/mwmechanics/spells.hpp | 1 - 24 files changed, 6 insertions(+), 40 deletions(-) diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp index 37ceab077f..20f5d8c7da 100644 --- a/apps/openmw/mwclass/apparatus.cpp +++ b/apps/openmw/mwclass/apparatus.cpp @@ -10,8 +10,6 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/actionalchemy.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwrender/objects.hpp" #include "../mwrender/renderinginterface.hpp" diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 59977cf7ea..4c36103a1f 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/apps/openmw/mwclass/armor.cpp @@ -15,8 +15,6 @@ #include "../mwworld/inventorystore.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwworld/containerstore.hpp" #include "../mwrender/objects.hpp" diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp index 8cb9623755..f631772fa4 100644 --- a/apps/openmw/mwclass/book.cpp +++ b/apps/openmw/mwclass/book.cpp @@ -6,7 +6,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" -#include "../mwbase/soundmanager.hpp" #include "../mwbase/windowmanager.hpp" #include "../mwworld/ptr.hpp" @@ -14,7 +13,6 @@ #include "../mwworld/failedaction.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" #include "../mwrender/objects.hpp" #include "../mwrender/renderinginterface.hpp" diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp index 33ea292258..b17c2261b2 100644 --- a/apps/openmw/mwclass/clothing.cpp +++ b/apps/openmw/mwclass/clothing.cpp @@ -13,8 +13,6 @@ #include "../mwworld/inventorystore.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp index 07a216a3f1..36076f100b 100644 --- a/apps/openmw/mwclass/creature.cpp +++ b/apps/openmw/mwclass/creature.cpp @@ -10,7 +10,6 @@ #include "../mwmechanics/magiceffects.hpp" #include "../mwmechanics/movement.hpp" #include "../mwmechanics/disease.hpp" -#include "../mwmechanics/spellcasting.hpp" #include "../mwmechanics/difficultyscaling.hpp" #include "../mwmechanics/npcstats.hpp" #include "../mwmechanics/combat.hpp" diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp index 6ce5d8d4bb..1f04db4582 100644 --- a/apps/openmw/mwclass/door.cpp +++ b/apps/openmw/mwclass/door.cpp @@ -18,10 +18,10 @@ #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" #include "../mwphysics/physicssystem.hpp" -#include "../mwworld/inventorystore.hpp" #include "../mwworld/actiontrap.hpp" #include "../mwworld/customdata.hpp" #include "../mwworld/cellutils.hpp" +#include "../mwworld/containerstore.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp index 5ac9d36540..887347771c 100644 --- a/apps/openmw/mwclass/ingredient.cpp +++ b/apps/openmw/mwclass/ingredient.cpp @@ -11,9 +11,7 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" #include "../mwworld/actioneat.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp index dabf25e672..61a7db55ca 100644 --- a/apps/openmw/mwclass/lockpick.cpp +++ b/apps/openmw/mwclass/lockpick.cpp @@ -12,8 +12,6 @@ #include "../mwworld/actionequip.hpp" #include "../mwworld/inventorystore.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp index fe8c3847f0..7144c51242 100644 --- a/apps/openmw/mwclass/misc.cpp +++ b/apps/openmw/mwclass/misc.cpp @@ -11,7 +11,6 @@ #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" #include "../mwworld/manualref.hpp" #include "../mwworld/nullaction.hpp" #include "../mwworld/actionsoulgem.hpp" diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp index 583005e17e..01dcfbecc1 100644 --- a/apps/openmw/mwclass/potion.cpp +++ b/apps/openmw/mwclass/potion.cpp @@ -11,9 +11,6 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/actionapply.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp index 56ca071f8c..32c7da313a 100644 --- a/apps/openmw/mwclass/probe.cpp +++ b/apps/openmw/mwclass/probe.cpp @@ -12,8 +12,6 @@ #include "../mwworld/actionequip.hpp" #include "../mwworld/inventorystore.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp index b182b2d9d9..bd0071e234 100644 --- a/apps/openmw/mwclass/repair.cpp +++ b/apps/openmw/mwclass/repair.cpp @@ -9,7 +9,6 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/cellstore.hpp" -#include "../mwphysics/physicssystem.hpp" #include "../mwworld/actionrepair.hpp" #include "../mwgui/tooltips.hpp" diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp index a3749fd2d4..109ba94774 100644 --- a/apps/openmw/mwclass/weapon.cpp +++ b/apps/openmw/mwclass/weapon.cpp @@ -16,8 +16,6 @@ #include "../mwworld/inventorystore.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwphysics/physicssystem.hpp" -#include "../mwworld/nullaction.hpp" #include "../mwmechanics/weapontype.hpp" diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp index 55b089dc52..9f8252c8a4 100644 --- a/apps/openmw/mwmechanics/activespells.hpp +++ b/apps/openmw/mwmechanics/activespells.hpp @@ -13,7 +13,6 @@ #include "../mwworld/timestamp.hpp" #include "../mwworld/ptr.hpp" -#include "magiceffects.hpp" #include "spellcasting.hpp" namespace ESM diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp index eae5ec5b6b..fbd36b6512 100644 --- a/apps/openmw/mwmechanics/aiactivate.hpp +++ b/apps/openmw/mwmechanics/aiactivate.hpp @@ -6,8 +6,6 @@ #include #include -#include "pathfinding.hpp" - namespace ESM { namespace AiSequence diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp index 183f429f3f..5a91bb012d 100644 --- a/apps/openmw/mwmechanics/aiavoiddoor.hpp +++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp @@ -3,10 +3,6 @@ #include "typedaipackage.hpp" -#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 84221537bb..2be388568b 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -18,6 +18,7 @@ #include "../mwbase/environment.hpp" #include "../mwbase/dialoguemanager.hpp" #include "../mwbase/mechanicsmanager.hpp" +#include "../mwbase/world.hpp" #include "pathgrid.hpp" #include "creaturestats.hpp" @@ -26,6 +27,7 @@ #include "character.hpp" #include "aicombataction.hpp" #include "actorutil.hpp" +#include "weapontype.hpp" namespace { diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp index 1d8b8a38b3..a9153041e3 100644 --- a/apps/openmw/mwmechanics/aicombat.hpp +++ b/apps/openmw/mwmechanics/aicombat.hpp @@ -6,9 +6,6 @@ #include "../mwworld/cellstore.hpp" // for Doors -#include "../mwbase/world.hpp" - -#include "pathfinding.hpp" #include "movement.hpp" #include "aitimer.hpp" diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp index 1151005eb4..96f1c474b3 100644 --- a/apps/openmw/mwmechanics/aiwander.hpp +++ b/apps/openmw/mwmechanics/aiwander.hpp @@ -6,7 +6,6 @@ #include #include "pathfinding.hpp" -#include "obstacle.hpp" #include "aitemporarybase.hpp" #include "aitimer.hpp" diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 79b353384b..090b4e902b 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -51,6 +51,7 @@ #include "security.hpp" #include "actorutil.hpp" #include "spellcasting.hpp" +#include "weapontype.hpp" namespace { diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp index 4ff9116f1b..48eefdb4b3 100644 --- a/apps/openmw/mwmechanics/character.hpp +++ b/apps/openmw/mwmechanics/character.hpp @@ -3,13 +3,12 @@ #include +#include + #include "../mwworld/ptr.hpp" -#include "../mwworld/containerstore.hpp" #include "../mwrender/animation.hpp" -#include "weapontype.hpp" - namespace MWWorld { class InventoryStore; diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp index 4dd8790d2a..43e6794429 100644 --- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp +++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp @@ -7,7 +7,6 @@ #include "../mwworld/ptr.hpp" -#include "creaturestats.hpp" #include "npcstats.hpp" #include "objects.hpp" #include "actors.hpp" diff --git a/apps/openmw/mwmechanics/setbaseaisetting.hpp b/apps/openmw/mwmechanics/setbaseaisetting.hpp index 523161f731..f90462182e 100644 --- a/apps/openmw/mwmechanics/setbaseaisetting.hpp +++ b/apps/openmw/mwmechanics/setbaseaisetting.hpp @@ -9,7 +9,6 @@ #include "../mwworld/esmstore.hpp" #include "aisetting.hpp" -#include "creaturestats.hpp" namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp index 192edd19f0..ff803a9ec2 100644 --- a/apps/openmw/mwmechanics/spells.hpp +++ b/apps/openmw/mwmechanics/spells.hpp @@ -8,7 +8,6 @@ #include "../mwworld/timestamp.hpp" -#include "magiceffects.hpp" #include "spelllist.hpp" namespace ESM