diff options
| author | erihel <erihel@gmail.com> | 2013-04-29 14:20:07 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-04-29 14:20:07 +0200 |
| commit | 64162a0e6ffd799caddac98b8daa6fa4f31b7d64 (patch) | |
| tree | 78ffa751dc56cf0842e0242edb1b2dbb06f98788 /src/object/object.cpp | |
| parent | 919b0e8114368132c88d95768b43fc17c70b699d (diff) | |
| parent | d425e09186cb93d4c873665c87535beb050c3389 (diff) | |
| download | colobot-64162a0e6ffd799caddac98b8daa6fa4f31b7d64.tar.gz colobot-64162a0e6ffd799caddac98b8daa6fa4f31b7d64.tar.bz2 colobot-64162a0e6ffd799caddac98b8daa6fa4f31b7d64.zip | |
Merge branch 'fix-for-shadows' of https://github.com/xiendev/colobot into xiendev-fix-for-shadows
Diffstat (limited to 'src/object/object.cpp')
| -rw-r--r-- | src/object/object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/object/object.cpp b/src/object/object.cpp index ce79e34..3459644 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -64,6 +64,7 @@ #include "object/motion/motion.h" #include "object/motion/motionant.h" #include "object/motion/motionbee.h" +#include "object/motion/motiondummy.h" #include "object/motion/motionhuman.h" #include "object/motion/motionmother.h" #include "object/motion/motionspider.h" @@ -2146,7 +2147,7 @@ bool CObject::CreateVehicle(Math::Vector pos, float angle, ObjectType type, m_motion = new CMotionHuman(this); } else if ( type == OBJECT_CONTROLLER ) { - m_motion = new CMotion(this); //dummy object + m_motion = new CMotionDummy(this); //dummy object } else { m_motion = new CMotionVehicle(this); |