diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
| commit | 77bd13f49fb974cb50918b18d166ab61240c0d34 (patch) | |
| tree | 2a824960ef146e23ca772c8dc0215e70f586ed8f /src/object/motion/motionhuman.cpp | |
| parent | 6a059b437dca706a72233a57ba4c22011aba6dde (diff) | |
| parent | c2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff) | |
| download | colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2 colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip | |
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/object/motion/motionhuman.cpp')
| -rw-r--r-- | src/object/motion/motionhuman.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index 06db454..ba3003a 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -912,7 +912,7 @@ bool CMotionHuman::EventFrame(const Event &event) { armAction = MH_MARCHTAKE; // take walking } - + if ( m_physics->RetLand() ) // on the ground? { a = m_object->RetAngleY(0); @@ -944,7 +944,7 @@ bool CMotionHuman::EventFrame(const Event &event) ar = 0.0f; af = 0.0f; } - + for ( i=0 ; i<4 ; i++ ) // 4 members { if ( m_bArmStop ) // focus? |