From bb35585194d11c70acdb2666b20b32a1e8a9d6dd Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 3 Jun 2017 21:43:10 +0200 Subject: [PATCH] Fix object.factory() code type detection, closes #938 --- src/object/auto/autofactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 7dfc280d..45fd357c 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -405,12 +405,12 @@ bool CAutoFactory::EventProcess(const Event &event) { Program* program = dynamic_cast(vehicle)->AddProgram(); - if (boost::regex_search(m_program, boost::regex("^[A-Za-z0-9_]+$"))) // Public function name? + if (boost::regex_match(m_program, boost::regex("[A-Za-z0-9_]+"))) // Public function name? { std::string code = "extern void object::Start_"+m_program+"()\n{\n\t\n\t//Automatically generated by object.factory()\n\t"+m_program+"();\n\t\n}\n"; program->script->SendScript(code.c_str()); } - else if (boost::regex_search(m_program, boost::regex("\\.txt$"))) // File name (with .txt extension)? + else if (boost::regex_match(m_program, boost::regex(".*\\.txt"))) // File name (with .txt extension)? { program->script->ReadScript(m_program.c_str()); }