Fix: Procedure calls in switch ranges

OpenTTD · Jun 3, 2020 · 9ccffc3 · 9ccffc3
1 parent 1d67cce
commit 9ccffc3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/nml/actions/action2var.py b/nml/actions/action2var.py
@@ -697,7 +697,7 @@ def parse_minmax(value, unit_str, action_list, act6, offset):
 
 return_action_id = 0
 
-def create_return_action(expr, feature, name, var_range):
+def create_return_action(expr, feature, name, var_range, parent_action = None):
     """
     Create a varaction2 to return the computed value
 
@@ -729,6 +729,10 @@ def create_return_action(expr, feature, name, var_range):
     varaction2.default_result = expression.ConstantNumeric(0) # Bogus result, it's the nvar == 0 that matters
     varaction2.default_comment = 'Return computed value'
 
+    if parent_action:
+        for proc in varact2parser.proc_call_list:
+            action2.add_ref(proc, parent_action, True)
+
     ref = expression.SpriteGroupRef(expression.Identifier(name), [], None, varaction2)
     action_list.append(varaction2)
     return (action_list, ref)
@@ -926,7 +930,7 @@ def parse_result(value, action_list, act6, offset, parent_action, none_result, v
         result = expression.ConstantNumeric(0)
     else:
         global return_action_id
-        extra_actions, result = create_return_action(value, parent_action.feature, "@return_action_{:d}".format(return_action_id), var_range)
+        extra_actions, result = create_return_action(value, parent_action.feature, "@return_action_{:d}".format(return_action_id), var_range, parent_action)
         return_action_id += 1
         action2.add_ref(result, parent_action)
         action_list.extend(extra_actions)