Changeset 3196 for code/trunk/src/orxonox/objects/items

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/items/Engine.cc (modified) (2 diffs)
• src/orxonox/objects/items/Engine.h (modified) (1 diff)
• src/orxonox/objects/items/Item.cc (modified) (2 diffs)
• src/orxonox/objects/items/Item.h (modified) (1 diff)
• src/orxonox/objects/items/MultiStateEngine.cc (modified) (1 diff)
• src/orxonox/objects/items/MultiStateEngine.h (modified) (1 diff)

code/trunk/src/orxonox/objects/items/Engine.cc

@@ -29 +29 @@
 #include "Engine.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -34 +35 @@
 #include "objects/Scene.h"
 #include "objects/worldentities/pawns/SpaceShip.h"
+#include "objects/pickup/ModifierType.h"
 #include "tools/Shader.h"
 #include "sound/SoundBase.h"

code/trunk/src/orxonox/objects/items/Engine.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/Tickable.h"
 #include "Item.h"
-#include "objects/Tickable.h"
-#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/items/Item.cc

@@ -28 +28 @@
 
 #include "Item.h"
-
 #include "core/CoreIncludes.h"
 
@@ -37 +36 @@
         RegisterObject(Item);
     }
-
-    Item::~Item()
-    {
-    }
 }

code/trunk/src/orxonox/objects/items/Item.h

@@ -41 +41 @@
         public:
             Item(BaseObject* creator);
-            virtual ~Item();
+            virtual ~Item() {}
     };
 }

code/trunk/src/orxonox/objects/items/MultiStateEngine.cc

@@ -29 +29 @@
 #include "MultiStateEngine.h"
 
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/pawns/SpaceShip.h"

code/trunk/src/orxonox/objects/items/MultiStateEngine.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <list>
 #include "Engine.h"