immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restored Ceebot-Teen toy sound

dev-time-step
krzys-h 2015-10-04 18:13:13 +02:00
parent d11ebc891c
commit 0aa97fe074
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit bbfc7d0ea4e90b9d9694a3812874afeabc7bbbfb Subproject commit 4ecbafd960f3718dc166cbc1011f42deb51e11dd

4
src/physics/physics.cpp
View File

@ -1903,7 +1903,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type)
if ( m_object->GetToy() ) if ( m_object->GetToy() )
{ {
sound = SOUND_NONE; //SOUND_MOTORd; sound = SOUND_MOTORd;
amplitude = 1.0f; amplitude = 1.0f;
time = 0.1f; time = 0.1f;
} }
@ -2002,7 +2002,7 @@ void CPhysics::SoundMotorSlow(float rTime, ObjectType type)
if ( m_object->GetToy() ) if ( m_object->GetToy() )
{ {
sound = SOUND_NONE; // SOUND_MOTORd; sound = SOUND_MOTORd;
amplitude = 0.0f; amplitude = 0.0f;
} }

2
src/sound/sound_type.h
View File

@ -110,7 +110,7 @@ enum SoundType
SOUND_FIREp = 78, /*!< shooting with phazer */ SOUND_FIREp = 78, /*!< shooting with phazer */
SOUND_EXPLOg1 = 79, /*!< impact gun 1 */ SOUND_EXPLOg1 = 79, /*!< impact gun 1 */
SOUND_EXPLOg2 = 80, /*!< impact gun 2 */ SOUND_EXPLOg2 = 80, /*!< impact gun 2 */
// SOUND_MOTORd = 81, /*!< engine friction */ SOUND_MOTORd = 81, /*!< engine friction */
SOUND_MAX /** number of items in enum */ SOUND_MAX /** number of items in enum */
}; };