Skip to content

Commit

Permalink
Fix List<T> access
Browse files Browse the repository at this point in the history
Due to upstream change:

	godotengine/godot@955d5af
  • Loading branch information
Rubonnek committed May 7, 2024
1 parent 5258506 commit 8f684f4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion blackboard/blackboard_plan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ BBVariable BlackboardPlan::get_var(const StringName &p_name) {
Pair<StringName, BBVariable> BlackboardPlan::get_var_by_index(int p_index) {
Pair<StringName, BBVariable> ret;
ERR_FAIL_INDEX_V(p_index, (int)var_map.size(), ret);
return var_list[p_index];
return var_list.get(p_index);

Check failure on line 172 in blackboard/blackboard_plan.cpp

View workflow job for this annotation

GitHub Actions / 🧪 Unit tests

'class List<Pair<StringName, BBVariable> >' has no member named 'get'

Check failure on line 172 in blackboard/blackboard_plan.cpp

View workflow job for this annotation

GitHub Actions / 🔌 GDExtension / 🪟 Windows (x86_64, release)

'get': is not a member of 'godot::List<godot::Pair<godot::StringName,BBVariable>,godot::DefaultAllocator>'

Check failure on line 172 in blackboard/blackboard_plan.cpp

View workflow job for this annotation

GitHub Actions / 🔌 GDExtension / 🪟 Windows (x86_64, debug)

'get': is not a member of 'godot::List<godot::Pair<godot::StringName,BBVariable>,godot::DefaultAllocator>'
}

PackedStringArray BlackboardPlan::list_vars() const {
Expand Down
4 changes: 2 additions & 2 deletions editor/debugger/behavior_tree_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Array BehaviorTreeData::serialize(const Ref<BTTask> &p_tree_instance, const Node
List<Ref<BTTask>> stack;
stack.push_back(p_tree_instance);
while (stack.size()) {
Ref<BTTask> task = stack[0];
Ref<BTTask> task = stack.front()->get();
stack.pop_front();

int num_children = task->get_child_count();
Expand Down Expand Up @@ -87,7 +87,7 @@ Ref<BehaviorTreeData> BehaviorTreeData::create_from_tree_instance(const Ref<BTTa
List<Ref<BTTask>> stack;
stack.push_back(p_tree_instance);
while (stack.size()) {
Ref<BTTask> task = stack[0];
Ref<BTTask> task = stack.front()->get();
stack.pop_front();

int num_children = task->get_child_count();
Expand Down
14 changes: 7 additions & 7 deletions editor/debugger/behavior_tree_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -111,7 +111,7 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &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.

Expand All @@ -120,9 +120,9 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &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);
Expand All @@ -142,7 +142,7 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &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()) {
Expand All @@ -165,7 +165,7 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &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;
Expand All @@ -174,7 +174,7 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &p_data) {
// Figure out parent.
parent = nullptr;
if (parents.size()) {
Pair<TreeItem *, int> &p = parents[0];
Pair<TreeItem *, int> &p = parents.front()->get();
parent = p.first;
if (!(--p.second)) {
// No children left, remove it.
Expand Down

0 comments on commit 8f684f4

Please sign in to comment.