Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6205


Ignore:
Timestamp:
Dec 2, 2009, 5:12:06 PM (15 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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/src/orxonox/MoodManager.cc

    r6182 r6205  
    7878            ResetConfigValue(mood_);
    7979        }
    80         COUT(0) << "MoodManager: Mood now set to " << mood_ << std::endl;
     80        COUT(3) << "MoodManager: Mood now set to " << mood_ << std::endl;
    8181        return;
    8282    }
  • code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

    r6202 r6205  
    107107                {
    108108                    newState = Boost;
    109                     pitch = pitch/MAX_VELOCITY_BOOST + 1;
     109                    /*pitch = pitch/MAX_VELOCITY_BOOST + 1;
    110110                    pitch = pitch > 2 ? 2 : pitch;
    111111                    pitch = pitch < 0.5 ? 0.5 : pitch;
    112                     defEngineSndNormal_->setPitch(pitch);
     112                    defEngineSndNormal_->setPitch(pitch);*/
    113113                }
    114114                else if (forward && !newState) // newState == Boost
  • code/branches/presentation2/src/orxonox/sound/BaseSound.cc

    r6204 r6205  
    151151            if (int error = alGetError())
    152152                COUT(2) << "Sound: Error setting pitch: " << error << std::endl;
    153             alSourcei(this->audioSource_, AL_PITCH, pitch);
     153            alSourcef(this->audioSource_, AL_PITCH, pitch);
    154154        }
    155155    }
Note: See TracChangeset for help on using the changeset viewer.