diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
commit | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (patch) | |
tree | 4bca38da7bc4983d47192adfcc3cc01407cfb776 /src/object/auto/autonest.cpp | |
parent | d439f4fa93eb45175dcdfa773af8f68efa1bad9d (diff) | |
parent | a1400f496bbe9f78f71736dce43863b6833be669 (diff) | |
download | colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.gz colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.bz2 colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.zip |
Merge branch 'dev-object' into dev
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
Diffstat (limited to 'src/object/auto/autonest.cpp')
-rw-r--r-- | src/object/auto/autonest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 9658e23..d7f94e1 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -76,7 +76,7 @@ void CAutoNest::Init() m_lastParticle = 0.0f; pos = m_object->GetPosition(0); - m_terrain->MoveOnFloor(pos); + m_terrain->AdjustToFloor(pos); m_fretPos = pos; } |