Skip to content
Snippets Groups Projects
Commit 6ba1f773 authored by Annika Österdiekhoff's avatar Annika Österdiekhoff
Browse files

fix error due to merging main

parent 83f5aacc
No related branches found
No related tags found
1 merge request!45Resolve "Controller Support"
Pipeline #46213 passed
...@@ -275,7 +275,7 @@ class PyGameGUI: ...@@ -275,7 +275,7 @@ class PyGameGUI:
# Axis 0: joy stick left: -1 = left, ~0 = center, 1 = right # Axis 0: joy stick left: -1 = left, ~0 = center, 1 = right
# Axis 1: joy stick left: -1 = up, ~0 = center, 1 = down # 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 # 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 a joystick is connected for current player
if joysticks[key_set.joystick]: if joysticks[key_set.joystick]:
# Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes. # 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: ...@@ -343,7 +343,7 @@ class PyGameGUI:
joysticks: list of joysticks 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 a joystick is connected for current player
if joysticks[key_set.joystick]: if joysticks[key_set.joystick]:
# pickup = Button A <-> 0 # pickup = Button A <-> 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment