diff options
author | krzys-h <krzys_h@interia.pl> | 2013-04-27 13:43:01 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-04-27 13:43:01 +0200 |
commit | 4f1e000ceae2a85f8b5e9fce1534e23f0cb82d38 (patch) | |
tree | 19edca278236c35ce8b815862f705a273a5189e6 /src/object/robotmain.cpp | |
parent | a693e87293e9daf8ab380d6d7e52d5233f676323 (diff) | |
download | colobot-4f1e000ceae2a85f8b5e9fce1534e23f0cb82d38.tar.gz colobot-4f1e000ceae2a85f8b5e9fce1534e23f0cb82d38.tar.bz2 colobot-4f1e000ceae2a85f8b5e9fce1534e23f0cb82d38.zip |
Fix for #167 when starting mission
+ various fixes
Diffstat (limited to 'src/object/robotmain.cpp')
-rw-r--r-- | src/object/robotmain.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 9599cee..6ba09a5 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -4247,6 +4247,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) m_terrain->InitTextures(name, tt, dx, dy); m_terrainInitTextures = true; + continue; } if (Cmd(line, "TerrainInit") && !resetObject) { @@ -4462,8 +4463,11 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) obj->SetShield(OpFloat(line, "shield", 1.0f)); obj->SetMagnifyDamage(OpFloat(line, "magnifyDamage", 1.0f)); obj->SetClip(OpInt(line, "clip", 1)); - obj->SetCheckToken(m_version >= 2 ? trainer : OpInt(line, "manual", 1)); - obj->SetManual(m_version >= 2 ? !trainer : OpInt(line, "manual", 0)); + obj->SetCheckToken(m_version >= 2 ? trainer : OpInt(line, "checkToken", 1)); + // SetManual will affect bot speed + if (type == OBJECT_MOBILEdr) { + obj->SetManual(m_version >= 2 ? !trainer : OpInt(line, "manual", 0)); + } if(m_version >= 2) { Math::Vector zoom = OpDir(line, "zoom"); |