Merge branch 'cleanup_openmw_includes_2' into 'master'

Cleanup openmw class and mechanics includes

See merge request OpenMW/openmw!2301

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"

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"

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"

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"
 

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"

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"

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"
 

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

apps/openmw/mwmechanics/aiactivate.hpp

@@ -6,8 +6,6 @@
 #include <string>
 #include <string_view>
 
-#include "pathfinding.hpp"
-
 namespace ESM
 {
 namespace AiSequence

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

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
 {

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"
 

apps/openmw/mwmechanics/aiwander.hpp

@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "pathfinding.hpp"
-#include "obstacle.hpp"
 #include "aitemporarybase.hpp"
 #include "aitimer.hpp"
 

apps/openmw/mwmechanics/character.cpp

@@ -51,6 +51,7 @@
 #include "security.hpp"
 #include "actorutil.hpp"
 #include "spellcasting.hpp"
+#include "weapontype.hpp"
 
 namespace
 {

apps/openmw/mwmechanics/character.hpp

@@ -3,13 +3,12 @@
 
 #include <deque>
 
+#include <components/esm3/loadweap.hpp>
+
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/containerstore.hpp"
 
 #include "../mwrender/animation.hpp"
 
-#include "weapontype.hpp"
-
 namespace MWWorld
 {
     class InventoryStore;

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"

apps/openmw/mwmechanics/setbaseaisetting.hpp

@@ -9,7 +9,6 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "aisetting.hpp"
-#include "creaturestats.hpp"
 
 namespace MWMechanics
 {

apps/openmw/mwmechanics/spells.hpp

@@ -8,7 +8,6 @@
 
 #include "../mwworld/timestamp.hpp"
 
-#include "magiceffects.hpp"
 #include "spelllist.hpp"
 
 namespace ESM