[colobot] 35/377: Restored Ceebot-Teen toy sound

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 0aa97fe074ecfec6db2930b8443146a3430f1335
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun Oct 4 18:13:13 2015 +0200

    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 bbfc7d0..4ecbafd 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 01a4041..cd91f7d 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 e345d30..c9ba3f3 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 */
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git