Changeset 6222 for code/branches

Timestamp:

Dec 3, 2009, 12:27:20 AM (15 years ago)

Author:

youngk

Message:

Cleaned up the code a little

Location:

code/branches/presentation2/src/orxonox

Files:

• items/MultiStateEngine.cc (modified) (1 diff)
• sound/BaseSound.cc (modified) (1 diff)

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -55 +55 @@
         RegisterObject(MultiStateEngine);
 
-        defEngineSndNormal_ = new WorldSound(this);
-        defEngineSndBoost_ = new WorldSound(this);
-        defEngineSndNormal_->setLooping(true);
-        defEngineSndBoost_->setLooping(true);
+        this->defEngineSndNormal_ = new WorldSound(this);
+        this->defEngineSndBoost_ = new WorldSound(this);
+        this->defEngineSndNormal_->setLooping(true);
+        this->defEngineSndBoost_->setLooping(true);
 
         this->lua_ = new LuaState();

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -47 +47 @@
         , bLoop_(false)
         , state_(Stopped)
+        , pitch_ (1.0)
     {
         RegisterRootObject(BaseSound);
-
-        this->volume_ = 1;
-        this->pitch_ = 1;
 
         if (GameMode::playsSound())