diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-24 21:37:15 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-24 21:37:15 +0200 |
| commit | 7c2e955e1552a9c4e412ea2c936be61fc78ba010 (patch) | |
| tree | ee506dfbec54f998d10c385bde3a1c3fa04e66b2 /src/physics | |
| parent | e218dcfdf2c58f8841e7ebd220527d08e870a6d5 (diff) | |
| parent | b376486fd74fa02b0297ceef6d0f977b32358e5e (diff) | |
| download | colobot-7c2e955e1552a9c4e412ea2c936be61fc78ba010.tar.gz colobot-7c2e955e1552a9c4e412ea2c936be61fc78ba010.tar.bz2 colobot-7c2e955e1552a9c4e412ea2c936be61fc78ba010.zip | |
Colobot Gold 0.1.0-alpha
Diffstat (limited to 'src/physics')
| -rw-r--r-- | src/physics/README.txt | 1 | ||||
| -rw-r--r-- | src/physics/physics.cpp | 7 | ||||
| -rw-r--r-- | src/physics/physics.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/physics/README.txt b/src/physics/README.txt index c068d4d..dd74709 100644 --- a/src/physics/README.txt +++ b/src/physics/README.txt @@ -2,3 +2,4 @@ * \dir src/physics * \brief Physics engine */ + diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 6311ecf..2c5f95e 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -794,7 +794,8 @@ void CPhysics::MotorUpdate(float aTime, float rTime) type == OBJECT_BEE || type == OBJECT_WORM || type == OBJECT_APOLLO2 || - type == OBJECT_MOBILEdr ) + type == OBJECT_MOBILEdr || + type == OBJECT_CONTROLLER) { power = 0; } @@ -1916,7 +1917,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type) if ( m_object->GetToy() ) { - sound = SOUND_MOTORd; + sound = SOUND_NONE; //SOUND_MOTORd; amplitude = 1.0f; time = 0.1f; } @@ -2015,7 +2016,7 @@ void CPhysics::SoundMotorSlow(float rTime, ObjectType type) if ( m_object->GetToy() ) { - sound = SOUND_MOTORd; + sound = SOUND_NONE; // SOUND_MOTORd; amplitude = 0.0f; } diff --git a/src/physics/physics.h b/src/physics/physics.h index cce57f3..834d7b8 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -250,4 +250,3 @@ protected: bool m_bLowLevel; }; - |