Changeset 6205 for code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

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.

File:

• code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) (1 diff)

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