Changeset 9667 for code/trunk/src/orxonox/items/MultiStateEngine.cc

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/MultiStateEngine.cc (modified) (2 diffs)

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);