From a918fcabb4ee53bb3cab9a1c91ab55835df21944 Mon Sep 17 00:00:00 2001 From: melex750 Date: Mon, 30 Apr 2018 13:43:03 -0400 Subject: [PATCH] Fix save/load NewScript programs for factory bots Fixes #797 --- src/level/robotmain.cpp | 2 +- src/object/auto/autofactory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 5e49cc68..9464c42d 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -3633,7 +3633,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) if (line->GetCommand() == "NewScript" && !resetObject) { - m_newScriptName.push_back(NewScriptName(line->GetParam("type")->AsObjectType(OBJECT_NULL), const_cast(line->GetParam("name")->AsPath("ai").c_str()))); + m_newScriptName.push_back(NewScriptName(line->GetParam("type")->AsObjectType(OBJECT_NULL), line->GetParam("name")->AsString(""))); continue; } diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 5da54545..343d57b9 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -667,7 +667,7 @@ bool CAutoFactory::CreateVehicle() for (const std::string& name : m_main->GetNewScriptNames(m_type)) { Program* prog = programStorage->AddProgram(); - programStorage->ReadProgram(prog, InjectLevelPathsForCurrentLevel(name)); + programStorage->ReadProgram(prog, InjectLevelPathsForCurrentLevel(name, "ai")); prog->readOnly = true; prog->filename = name; }