diff --git a/blackboard/blackboard_plan.cpp b/blackboard/blackboard_plan.cpp index d55cd03..a139175 100644 --- a/blackboard/blackboard_plan.cpp +++ b/blackboard/blackboard_plan.cpp @@ -169,7 +169,7 @@ BBVariable BlackboardPlan::get_var(const StringName &p_name) { Pair BlackboardPlan::get_var_by_index(int p_index) { Pair ret; ERR_FAIL_INDEX_V(p_index, (int)var_map.size(), ret); - return var_list[p_index]; + return var_list.get(p_index); } PackedStringArray BlackboardPlan::list_vars() const { diff --git a/editor/debugger/behavior_tree_data.cpp b/editor/debugger/behavior_tree_data.cpp index b86265f..c82312f 100644 --- a/editor/debugger/behavior_tree_data.cpp +++ b/editor/debugger/behavior_tree_data.cpp @@ -26,7 +26,7 @@ Array BehaviorTreeData::serialize(const Ref &p_tree_instance, const Node List> stack; stack.push_back(p_tree_instance); while (stack.size()) { - Ref task = stack[0]; + Ref task = stack.front()->get(); stack.pop_front(); int num_children = task->get_child_count(); @@ -87,7 +87,7 @@ Ref BehaviorTreeData::create_from_tree_instance(const Ref> stack; stack.push_back(p_tree_instance); while (stack.size()) { - Ref task = stack[0]; + Ref task = stack.front()->get(); stack.pop_front(); int num_children = task->get_child_count(); diff --git a/editor/debugger/behavior_tree_view.cpp b/editor/debugger/behavior_tree_view.cpp index c8541a7..87fd934 100644 --- a/editor/debugger/behavior_tree_view.cpp +++ b/editor/debugger/behavior_tree_view.cpp @@ -24,8 +24,8 @@ #include "core/object/callable_method_pointer.h" #include "core/os/time.h" #include "core/typedefs.h" -#include "editor/themes/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/themes/editor_scale.h" #include "scene/resources/style_box.h" #endif // LIMBOAI_MODULE @@ -111,7 +111,7 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { selected_id = item_get_task_id(tree->get_selected()); } - if (last_root_id != 0 && p_data->tasks.size() > 0 && last_root_id == (uint64_t)p_data->tasks[0].id) { + if (last_root_id != 0 && p_data->tasks.size() > 0 && last_root_id == (uint64_t)p_data->tasks.front()->get().id) { // * Update tree. // ! Update routine is built on assumption that the behavior tree does NOT mutate. With little work it could detect mutations. @@ -120,9 +120,9 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { while (item) { ERR_FAIL_COND(idx >= p_data->tasks.size()); - const BTTask::Status current_status = (BTTask::Status)p_data->tasks[idx].status; + const BTTask::Status current_status = (BTTask::Status)p_data->tasks.get(idx).status; const BTTask::Status last_status = item_get_task_status(item); - const bool status_changed = last_status != p_data->tasks[idx].status; + const bool status_changed = last_status != p_data->tasks.get(idx).status; if (status_changed) { item->set_metadata(1, current_status); @@ -142,7 +142,7 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { } if (status_changed || current_status == BTTask::RUNNING) { - _item_set_elapsed_time(item, p_data->tasks[idx].elapsed_time); + _item_set_elapsed_time(item, p_data->tasks.get(idx).elapsed_time); } if (item->get_first_child()) { @@ -165,7 +165,7 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { } else { // * Create new tree. - last_root_id = p_data->tasks.size() > 0 ? p_data->tasks[0].id : 0; + last_root_id = p_data->tasks.size() > 0 ? p_data->tasks.front()->get().id : 0; tree->clear(); TreeItem *parent = nullptr; @@ -174,7 +174,7 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { // Figure out parent. parent = nullptr; if (parents.size()) { - Pair &p = parents[0]; + Pair &p = parents.front()->get(); parent = p.first; if (!(--p.second)) { // No children left, remove it.