general cleanup

apps/openmw/mwclass/apparatus.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/apparatus.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_APPARATUS_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/armor.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/armor.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_ARMOR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/book.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/book.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_BOOK_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/clothing.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/clothing.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_CLOTHING_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/container.cpp

@@ -9,6 +9,8 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
 
+#include "../mwrender/objects.hpp"
+
 namespace
 {
     struct CustomData : public MWWorld::CustomData

apps/openmw/mwclass/container.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_CONTAINER_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/door.cpp

@@ -14,8 +14,6 @@
 
 #include "../mwrender/objects.hpp"
 
-#include <iostream>
-
 namespace MWClass
 {
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
@@ -39,13 +37,11 @@ namespace MWClass
          ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
             ptr.get<ESM::Door>();
 
-
         const std::string &model = ref->base->model;
         assert (ref->base != NULL);
         if(!model.empty()){
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
     std::string Door::getName (const MWWorld::Ptr& ptr) const
@@ -86,7 +82,7 @@ namespace MWClass
             }
             else
             {
-                // another NPC or a create is using the door
+                // another NPC or a creature is using the door
                 // TODO return action for teleporting other NPC/creature
                 return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
             }

apps/openmw/mwclass/door.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_DOOR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/ingredient.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -34,14 +35,11 @@ namespace MWClass
         ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
             ptr.get<ESM::Ingredient>();
 
-
-
         const std::string &model = ref->base->model;
         assert (ref->base != NULL);
         if(!model.empty()){
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const

apps/openmw/mwclass/ingredient.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_INGREDIENT_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/light.cpp

@@ -12,6 +12,8 @@
 
 #include "../mwsound/soundmanager.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass

apps/openmw/mwclass/light.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_LIGHT_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/lockpick.cpp

@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass

apps/openmw/mwclass/lockpick.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_LOCKPICK_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/misc.cpp

@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass

apps/openmw/mwclass/misc.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_MISC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/npc.cpp

@@ -17,6 +17,7 @@
 #include "../mwworld/environment.hpp"
 #include "../mwworld/world.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/customdata.hpp"
 
 namespace
 {

apps/openmw/mwclass/npc.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_NPC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/customdata.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/potion.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/potion.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_POTION_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/probe.hpp

@@ -3,7 +3,6 @@
 
 #include "../mwworld/class.hpp"
 
-
 namespace MWClass
 {
     class Probe : public MWWorld::Class

apps/openmw/mwclass/repair.cpp

@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass

apps/openmw/mwclass/repair.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_REPAIR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/static.cpp

@@ -5,6 +5,7 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/static.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_STATIC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/weapon.cpp

@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 

apps/openmw/mwclass/weapon.hpp

@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_WEAPON_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {