From 0aa97fe074ecfec6db2930b8443146a3430f1335 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sun, 4 Oct 2015 18:13:13 +0200 Subject: [PATCH] Restored Ceebot-Teen toy sound --- data | 2 +- src/physics/physics.cpp | 4 ++-- src/sound/sound_type.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data b/data index bbfc7d0e..4ecbafd9 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit bbfc7d0ea4e90b9d9694a3812874afeabc7bbbfb +Subproject commit 4ecbafd960f3718dc166cbc1011f42deb51e11dd diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 01a40417..cd91f7d3 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -1903,7 +1903,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type) if ( m_object->GetToy() ) { - sound = SOUND_NONE; //SOUND_MOTORd; + sound = SOUND_MOTORd; amplitude = 1.0f; time = 0.1f; } @@ -2002,7 +2002,7 @@ void CPhysics::SoundMotorSlow(float rTime, ObjectType type) if ( m_object->GetToy() ) { - sound = SOUND_NONE; // SOUND_MOTORd; + sound = SOUND_MOTORd; amplitude = 0.0f; } diff --git a/src/sound/sound_type.h b/src/sound/sound_type.h index e345d30f..c9ba3f3e 100644 --- a/src/sound/sound_type.h +++ b/src/sound/sound_type.h @@ -110,7 +110,7 @@ enum SoundType SOUND_FIREp = 78, /*!< shooting with phazer */ SOUND_EXPLOg1 = 79, /*!< impact gun 1 */ SOUND_EXPLOg2 = 80, /*!< impact gun 2 */ -// SOUND_MOTORd = 81, /*!< engine friction */ + SOUND_MOTORd = 81, /*!< engine friction */ SOUND_MAX /** number of items in enum */ };