Changeset 9667 for code/trunk/src/orxonox/items

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

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

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/Template.h"
 #include "core/XMLPort.h"
@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(Engine);
+    RegisterClass(Engine);
 
     /**
@@ -46 +46 @@
         Constructor. Registers and initializes the object.
     */
-    Engine::Engine(BaseObject* creator) : Item(creator)
+    Engine::Engine(Context* context) : Item(context)
     {
         RegisterObject(Engine);

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

@@ -56 +56 @@
     {
         public:
-            Engine(BaseObject* creator);
+            Engine(Context* context);
             virtual ~Engine();
 

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

@@ -32 +32 @@
 namespace orxonox
 {
-    Item::Item(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    RegisterClass(Item);
+
+    Item::Item(Context* context) : BaseObject(context), Synchronisable(context)
     {
         RegisterObject(Item);

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

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

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

@@ -49 +49 @@
     static const float MAX_VELOCITY_BOOST = 221;
 
-    CreateFactory(MultiStateEngine);
-
-    MultiStateEngine::MultiStateEngine(BaseObject* creator) : Engine(creator)
+    RegisterClass(MultiStateEngine);
+
+    MultiStateEngine::MultiStateEngine(Context* context) : Engine(context)
     {
         RegisterObject(MultiStateEngine);
@@ -57 +57 @@
         if (GameMode::isMaster())
         {
-            this->defEngineSndNormal_ = new WorldSound(this);
-            this->defEngineSndBoost_  = new WorldSound(this);
+            this->defEngineSndNormal_ = new WorldSound(this->getContext());
+            this->defEngineSndBoost_  = new WorldSound(this->getContext());
             this->defEngineSndNormal_->setLooping(true);
             this->defEngineSndBoost_->setLooping(true);

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

@@ -49 +49 @@
             };
 
-            MultiStateEngine(BaseObject* creator);
+            MultiStateEngine(Context* context);
             virtual ~MultiStateEngine();