fix issue #158: STRIG function - buttons mapped to wrong joystick

robhagemans · robhagemans · commit 7ca38a815437 · 2022-06-25T15:32:33.000+01:00
diff --git a/pcbasic/basic/inputs/stick.py b/pcbasic/basic/inputs/stick.py
@@ -88,8 +88,9 @@ def strig_(self, args):
         fn, = args
         fn = values.to_int(fn)
         error.range_check(0, 7, fn)
-        # 0,1 -> [0][0] 2,3 -> [0][1]  4,5-> [1][0]  6,7 -> [1][1]
-        joy, trig = fn // 4, (fn//2) % 2
+        # [stick][button]
+        # 0,1 -> [stick 0][button 0] 2,3 -> [1][0]  4,5-> [0][1]  6,7 -> [1][1]
+        joy, trig = (fn//2) % 2, fn // 4
         if fn % 2 == 0:
             # has been fired
             stick_was_trig = self._was_fired[joy][trig]
