botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix _generate_name fails without reporting an error if script is not a tool script

This commit is contained in:
Serhii Snitsaruk 2022-09-05 16:31:48 +02:00
parent 29dcabedf4
commit 8e45a4d38a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bt/bt_task.cpp
View File

@ -3,6 +3,7 @@
#include "bt_task.h" #include "bt_task.h"
#include "core/class_db.h" #include "core/class_db.h"
#include "core/error_macros.h"
#include "core/object.h" #include "core/object.h"
#include "core/script_language.h" #include "core/script_language.h"
#include "core/variant.h" #include "core/variant.h"
@ -13,12 +14,13 @@
String BTTask::_generate_name() const { String BTTask::_generate_name() const {
if (get_script_instance()) { if (get_script_instance()) {
if (get_script_instance()->has_method(LimboStringNames::get_singleton()->_generate_name)) { if (get_script_instance()->has_method(LimboStringNames::get_singleton()->_generate_name)) {
ERR_FAIL_COND_V_MSG(!get_script_instance()->get_script()->is_tool(), "ERROR: not a tool script", "Task script should be a \"tool\" script!");
return get_script_instance()->call(LimboStringNames::get_singleton()->_generate_name); return get_script_instance()->call(LimboStringNames::get_singleton()->_generate_name);
} }
String name = get_script_instance()->get_script()->get_path(); String name = get_script_instance()->get_script()->get_path();
if (!name.empty()) { if (!name.empty()) {
// Generate name based on script file // Generate name based on script file
name = name.get_basename().get_file(); name = name.get_basename().get_file().trim_prefix("BT");
return name; return name;
} }
} }