[Orxonox-commit 1487] r6205 - in code/branches/presentation2/src/orxonox: . items sound

[youngk at orxonox.net]

Author: youngk
Date: 2009-12-02 17:12:06 +0100 (Wed, 02 Dec 2009)
New Revision: 6205

Modified:
   code/branches/presentation2/src/orxonox/MoodManager.cc
   code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
   code/branches/presentation2/src/orxonox/sound/BaseSound.cc
Log:
Resolved Conflicts, edited a few COUTs and commented out a semi-obsolete chunk of code.

Modified: code/branches/presentation2/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/MoodManager.cc	2009-12-02 16:06:57 UTC (rev 6204)
+++ code/branches/presentation2/src/orxonox/MoodManager.cc	2009-12-02 16:12:06 UTC (rev 6205)
@@ -77,7 +77,7 @@
         {
             ResetConfigValue(mood_);
         }
-        COUT(0) << "MoodManager: Mood now set to " << mood_ << std::endl;
+        COUT(3) << "MoodManager: Mood now set to " << mood_ << std::endl;
         return;
     }
 }

Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-02 16:06:57 UTC (rev 6204)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-02 16:12:06 UTC (rev 6205)
@@ -106,10 +106,10 @@
                 if (this->getShip()->getBoost() && forward)
                 {
                     newState = Boost;
-                    pitch = pitch/MAX_VELOCITY_BOOST + 1;
+                    /*pitch = pitch/MAX_VELOCITY_BOOST + 1;
                     pitch = pitch > 2 ? 2 : pitch;
                     pitch = pitch < 0.5 ? 0.5 : pitch;
-                    defEngineSndNormal_->setPitch(pitch);
+                    defEngineSndNormal_->setPitch(pitch);*/
                 }
                 else if (forward && !newState) // newState == Boost
                 {

Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-02 16:06:57 UTC (rev 6204)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-02 16:12:06 UTC (rev 6205)
@@ -150,7 +150,7 @@
         {
             if (int error = alGetError())
                 COUT(2) << "Sound: Error setting pitch: " << error << std::endl;
-            alSourcei(this->audioSource_, AL_PITCH, pitch);
+            alSourcef(this->audioSource_, AL_PITCH, pitch);
         }
     }