Changeset 6205

Timestamp:

Dec 2, 2009, 5:12:06 PM (14 years ago)

Author:

youngk

Message:

Resolved Conflicts, edited a few COUTs and commented out a semi-obsolete chunk of code.

Location:

code/branches/presentation2/src/orxonox

Files:

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

code/branches/presentation2/src/orxonox/MoodManager.cc

@@ -78 +78 @@
             ResetConfigValue(mood_);
         }
-        COUT(0) << "MoodManager: Mood now set to " << mood_ << std::endl;
+        COUT(3) << "MoodManager: Mood now set to " << mood_ << std::endl;
         return;
     }

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

@@ -107 +107 @@
                 {
                     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

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

@@ -151 +151 @@
             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);
         }
     }