1 files changed, 2 insertions, 4 deletions

@@ -569,7 +569,6 @@ func _load():
         # Attach a script to every panel so that we can do things like conditionally
         # disable them.
         var panel_script = apclient.SCRIPT_panel
-        var panel_index = 0
         for panel in gamedata.panels:
                 var panel_node
                 if panel["id"].begins_with("EndPanel"):
@@ -579,14 +578,13 @@ func _load():
                 var script_instance = panel_script.new()
                 script_instance.name = "AP_Panel"
                 script_instance.data = panel
-                script_instance.solve_index = panel_index
+                script_instance.solve_index = panel["solve_index"]
                 if apclient._panel_door_shuffle and gamedata.mentioned_panels.has(panel["id"]):
                         script_instance.locked = true
                 panel_node.add_child(script_instance)
                 apclient.connect("evaluate_solvability", script_instance, "evaluate_solvability")
 
-                apclient._panelsBySolveIndex[panel_index] = panel["id"]
-                panel_index += 1
+                apclient._panelsBySolveIndex[panel["solve_index"]] = panel["id"]
 
         # Hook up the goal panel.
         if apclient._victory_condition == apclient.kTHE_MASTER: