[Orxonox-commit 1504] r6222 - in code/branches/presentation2/src/orxonox: items sound

[youngk at orxonox.net]

Author: youngk
Date: 2009-12-03 00:27:20 +0100 (Thu, 03 Dec 2009)
New Revision: 6222

Modified:
   code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
   code/branches/presentation2/src/orxonox/sound/BaseSound.cc
Log:
Cleaned up the code a little

Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-02 23:13:29 UTC (rev 6221)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-02 23:27:20 UTC (rev 6222)
@@ -54,10 +54,10 @@
     {
         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();
         this->state_ = 0;

Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-02 23:13:29 UTC (rev 6221)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-02 23:27:20 UTC (rev 6222)
@@ -46,12 +46,10 @@
         , volume_(1.0)
         , bLoop_(false)
         , state_(Stopped)
+        , pitch_ (1.0)
     {
         RegisterRootObject(BaseSound);
 
-        this->volume_ = 1;
-        this->pitch_ = 1;
-
         if (GameMode::playsSound())
         {
             alGenSources(1, &this->audioSource_);