Undid some code clean up changes, and changed how some includes work

apps/openmw/mwinput/inputmanagerimp.hpp

@@ -46,7 +46,10 @@ namespace MyGUI
 
 namespace MWInput
 {
-    /// \brief Class that handles all input and key bindings for OpenMW.
+
+    /**
+    * @brief Class that handles all input and key bindings for OpenMW.
+    */
     class InputManager :
             public MWBase::InputManager,
             public SFO::KeyListener,
@@ -65,7 +68,6 @@ namespace MWInput
         /// Clear all savegame-specific data
         virtual void clear();
 
-
         virtual void update(float dt, bool disableControls=false, bool disableEvents=false);
 
         void setPlayer (MWWorld::Player* player) { mPlayer = player; }

apps/openmw/mwmechanics/aiavoiddoor.hpp

@@ -4,7 +4,7 @@
 #include "aipackage.hpp"
 #include <string>
 #include "pathfinding.hpp"
-#include "../../../components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
 #include "../mwworld/class.hpp"
 
 namespace MWMechanics

apps/openmw/mwmechanics/aifollow.hpp

@@ -4,7 +4,7 @@
 #include "aipackage.hpp"
 #include <string>
 #include "pathfinding.hpp"
-#include "../../../components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
 
 namespace MWMechanics
 {

apps/openmw/mwmechanics/aipackage.hpp

@@ -2,7 +2,7 @@
 #define GAME_MWMECHANICS_AIPACKAGE_H
 
 #include "pathfinding.hpp"
-#include "../../../components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
 
 #include "obstacle.hpp"
 

apps/openmw/mwmechanics/alchemy.hpp

@@ -31,8 +31,6 @@ namespace MWMechanics
             typedef std::vector<ESM::ENAMstruct> TEffectsContainer;
             typedef TEffectsContainer::const_iterator TEffectsIterator;
 
-            /// Result of potion creation
-            /** Only Result_Success results in success **/
             enum Result
             {
                 Result_Success,
@@ -44,46 +42,6 @@ namespace MWMechanics
                 Result_RandomFailure
             };
 
-            /// Set alchemist and configure alchemy setup accordingly.
-            /** \a npc may be empty to indicate that there is no alchemist (alchemy session has ended). **/
-            void setAlchemist (const MWWorld::Ptr& npc);
-
-            /// \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
-            TToolsIterator beginTools() const;
-
-            TToolsIterator endTools() const;
-
-            /// \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
-            TIngredientsIterator beginIngredients() const;
-
-            TIngredientsIterator endIngredients() const;
-
-            /// Remove alchemist, tools and ingredients.
-            void clear();
-
-            /// Add ingredient into the next free slot.
-            ///
-            /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
-            /// listed already.
-            int addIngredient (const MWWorld::Ptr& ingredient);
-
-            /// Remove ingredient from slot (calling this function on an empty slot is a no-op).
-            void removeIngredient (int index);
-
-            TEffectsIterator beginEffects() const;
-
-            TEffectsIterator endEffects() const;
-
-            /// Return the name of the potion that would be created when calling create (if a record for such
-            /// a potion already exists) or return an empty string.
-            std::string getPotionName() const;
-
-            /// Try to create a potion from the ingredients, place it in the inventory of the alchemist and
-            /// adjust the skills of the alchemist accordingly.
-            /// \param name must not be an empty string, unless there is already a potion record (
-            /// getPotionName() does not return an empty string).
-            Result create (const std::string& name);
-
         private:
 
             MWWorld::Ptr mAlchemist;
@@ -92,19 +50,19 @@ namespace MWMechanics
             TEffectsContainer mEffects;
             int mValue;
 
-            /// List all effects shared by at least two ingredients.
             std::set<EffectKey> listEffects() const;
+            ///< List all effects shared by at least two ingredients.
 
             void applyTools (int flags, float& value) const;
 
             void updateEffects();
 
-            /// Return existing recrod for created potion (may return 0)
             const ESM::Potion *getRecord() const;
+            ///< Return existing recrod for created potion (may return 0)
 
-            /// Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
-            /// update effect list accordingly.
             void removeIngredients();
+            ///< Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
+            /// update effect list accordingly.
 
             void addPotion (const std::string& name);
             ///< Add a potion to the alchemist's inventory.
@@ -116,6 +74,48 @@ namespace MWMechanics
             ///< Return chance of success.
 
             int countIngredients() const;
+
+        public:
+
+            void setAlchemist (const MWWorld::Ptr& npc);
+            ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
+            /// there is no alchemist (alchemy session has ended).
+
+            TToolsIterator beginTools() const;
+            ///< \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
+
+            TToolsIterator endTools() const;
+
+            TIngredientsIterator beginIngredients() const;
+            ///< \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
+
+            TIngredientsIterator endIngredients() const;
+
+            void clear();
+            ///< Remove alchemist, tools and ingredients.
+
+            int addIngredient (const MWWorld::Ptr& ingredient);
+            ///< Add ingredient into the next free slot.
+            ///
+            /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
+            /// listed already.
+
+            void removeIngredient (int index);
+            ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
+
+            TEffectsIterator beginEffects() const;
+
+            TEffectsIterator endEffects() const;
+
+            std::string getPotionName() const;
+            ///< Return the name of the potion that would be created when calling create (if a record for such
+            /// a potion already exists) or return an empty string.
+
+            Result create (const std::string& name);
+            ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
+            /// adjust the skills of the alchemist accordingly.
+            /// \param name must not be an empty string, unless there is already a potion record (
+            /// getPotionName() does not return an empty string).
     };
 }
 

apps/openmw/mwmechanics/character.hpp

@@ -21,11 +21,10 @@ namespace MWRender
 namespace MWMechanics
 {
 
-    class Movement;
+class Movement;
-    class CreatureStats;
+class CreatureStats;
 
-    ///Priority of actions
+enum Priority {
-    enum Priority {
     Priority_Default,
     Priority_Jump,
     Priority_Movement,
@@ -37,10 +36,9 @@ namespace MWMechanics
     Priority_Death,
 
     Num_Priorities
-    };
+};
 
-    /// Current action of the character
+enum CharacterState {
-    enum CharacterState {
     CharState_None,
 
     CharState_SpecialIdle,
@@ -99,10 +97,9 @@ namespace MWMechanics
     CharState_KnockDown,
     CharState_KnockOut,
     CharState_Block
-    };
+};
 
-    ///Weapon type
+enum WeaponType {
-    enum WeaponType {
     WeapType_None,
 
     WeapType_HandToHand,
@@ -115,10 +112,9 @@ namespace MWMechanics
     WeapType_PickProbe,
 
     WeapType_Spell
-    };
+};
 
-    ///Specific, weapon based state of the character
+enum UpperBodyCharacterState {
-    enum UpperBodyCharacterState {
     UpperCharState_Nothing,
     UpperCharState_EquipingWeap,
     UpperCharState_UnEquipingWeap,
@@ -129,17 +125,16 @@ namespace MWMechanics
     UpperCharState_MinHitToHit,
     UpperCharState_FollowStartToFollowStop,
     UpperCharState_CastingSpell
-    };
+};
 
-    ///Current jumping state
+enum JumpingState {
-    enum JumpingState {
     JumpState_None,
     JumpState_Falling,
     JumpState_Landing
-    };
+};
 
-    class CharacterController
+class CharacterController
-    {
+{
     MWWorld::Ptr mPtr;
     MWRender::Animation *mAnimation;
 
@@ -192,7 +187,7 @@ namespace MWMechanics
     /// @param num if non-NULL, the chosen animation number will be written here
     std::string chooseRandomGroup (const std::string& prefix, int* num = NULL);
 
-    public:
+public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
     virtual ~CharacterController();
 
@@ -213,7 +208,7 @@ namespace MWMechanics
     { return mDeathState != CharState_None; }
 
     void forceStateUpdate();
-    };
+};
 
     void getWeaponGroup(WeaponType weaptype, std::string &group);
     MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::InventoryStore &inv, WeaponType *weaptype);