From 9749419b8715b74a11fb0646a533b680f857f080 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 30 Jan 2016 17:24:02 +0100 Subject: [PATCH] Fixed LevelController --- src/level/robotmain.cpp | 2 +- src/object/object_factory.cpp | 1 + src/object/old_object.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 93d7234c..5dabcf13 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -3369,7 +3369,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) { CProgramStorageObject* programStorage = dynamic_cast(m_controller); Program* program = programStorage->AddProgram(); - programStorage->ReadProgram(program, "../" + line->GetParam("script")->AsPath("ai")); + programStorage->ReadProgram(program, line->GetParam("script")->AsPath("ai")); program->readOnly = true; dynamic_cast(m_controller)->RunProgram(program); } diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp index 090d0092..cf8eccda 100644 --- a/src/object/object_factory.cpp +++ b/src/object/object_factory.cpp @@ -305,6 +305,7 @@ CObjectUPtr CObjectFactory::CreateObject(const ObjectCreateParams& params) case OBJECT_MOBILEit: case OBJECT_MOBILEdr: case OBJECT_APOLLO2: + case OBJECT_CONTROLLER: return CBaseRobot::Create(params, m_oldModelManager, m_engine); case OBJECT_MOBILErs: diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index b7a7929d..9e7cb1bc 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -666,7 +666,8 @@ void COldObject::SetType(ObjectType type) m_type == OBJECT_MOBILEfi || // WingedOrgaShooter m_type == OBJECT_MOBILEft || // winged PracticeBot (unused) m_type == OBJECT_HUMAN || // Me - m_type == OBJECT_TECH ) // Tech + m_type == OBJECT_TECH || // Tech + m_type == OBJECT_CONTROLLER) { m_implementedInterfaces[static_cast(ObjectInterfaceType::Flying)] = true; m_implementedInterfaces[static_cast(ObjectInterfaceType::JetFlying)] = true; @@ -880,7 +881,8 @@ void COldObject::SetType(ObjectType type) m_type == OBJECT_WORM || m_type == OBJECT_SPIDER || m_type == OBJECT_BEE || - m_type == OBJECT_MOTHER ) + m_type == OBJECT_MOTHER || + m_type == OBJECT_CONTROLLER) { m_implementedInterfaces[static_cast(ObjectInterfaceType::Controllable)] = true; }