From 6ba1f77334a2e308254f68a3b28a52e2e6ec069c Mon Sep 17 00:00:00 2001
From: annika <annika.oesterdiekhoff@uni-bielefeld.de>
Date: Thu, 15 Feb 2024 11:12:32 +0100
Subject: [PATCH] fix error due to merging main
---
overcooked_simulator/gui_2d_vis/overcooked_gui.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 62e5ca63..7e280cf0 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -275,7 +275,7 @@ class PyGameGUI:
# Axis 0: joy stick left: -1 = left, ~0 = center, 1 = right
# Axis 1: joy stick left: -1 = up, ~0 = center, 1 = down
# see control stuff here (at the end of the page): https://www.pygame.org/docs/ref/joystick.html
- for key_set in self.player_key_sets:
+ for key_set in self.key_sets:
# if a joystick is connected for current player
if joysticks[key_set.joystick]:
# Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes.
@@ -343,7 +343,7 @@ class PyGameGUI:
joysticks: list of joysticks
"""
- for key_set in self.player_key_sets:
+ for key_set in self.key_sets:
# if a joystick is connected for current player
if joysticks[key_set.joystick]:
# pickup = Button A <-> 0
--
GitLab