Fix bug in disabled child checking

godot-addons · Jul 22, 2017 · 063f32e · 063f32e
1 parent 38dc0c8
commit 063f32e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/addons/com.brandonlamb.bt/selector.gd b/addons/com.brandonlamb.bt/selector.gd
@@ -23,11 +23,12 @@ func tick(actor, ctx):
  for idx in range(last_child_index, get_child_count()):
  var child = get_child(idx)
 
- if child.disabled:
- break
-
  last_child_index = idx
- last_result = child.tick(actor, ctx)
+
+ if child.disabled:
+ last_result = OK
+ else:
+ last_result = child.tick(actor, ctx)
 
  if typeof(last_result) == TYPE_OBJECT and last_result extends BehvError:
  break

diff --git a/addons/com.brandonlamb.bt/sequence.gd b/addons/com.brandonlamb.bt/sequence.gd
@@ -23,11 +23,12 @@ func tick(actor, ctx):
  for idx in range(last_child_index, get_child_count()):
  var child = get_child(idx)
 
- if child.disabled:
- break
-
  last_child_index = idx
- last_result = child.tick(actor, ctx)
+
+ if child.disabled:
+ last_result = OK
+ else:
+ last_result = child.tick(actor, ctx)
 
  if typeof(last_result) == TYPE_OBJECT and last_result extends BehvError:
  break