Merge branch 'dev' of github:colobot/colobot into dev

1 files changed, 4 insertions, 2 deletions

diff --git a/src/object/object.cpp b/src/object/object.cpp
index b621ef2..ce79e34 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -2145,8 +2145,10 @@ bool CObject::CreateVehicle(Math::Vector pos, float angle, ObjectType type,
     {
         m_motion = new CMotionHuman(this);
     }
-    else
-    {
+    else if ( type == OBJECT_CONTROLLER ) {
+        m_motion = new CMotion(this); //dummy object
+    }
+    else {
         m_motion = new CMotionVehicle(this);
     }
     if ( m_motion == 0 )  return false;