- joystick patch (argh, STICK is UBYTE[4], STICK[0xFF] pointed to sth else...)

- release 3

Changed files:
    Atari800-joystick.patch -> 1.1
    Atari800.spec -> 1.10

diff --git a/Atari800-joystick.patch b/Atari800-joystick.patch
new file mode 100644 (file)
index 0000000..8b4c737
--- /dev/null
+++ b/Atari800-joystick.patch
@@ -0,0 +1,55 @@
+--- Atari800/src/input.c.orig  Mon Nov  5 00:30:10 2001
++++ Atari800/src/input.c       Sat Dec 22 18:00:00 2001
+@@ -279,30 +279,30 @@
+       STICK[2] = i & 0x0f;
+       STICK[3] = (i >> 4) & 0x0f;
+ 
+-      if (joy_block_opposite_directions) {
+-              if ((STICK[i] & 0x0c) == 0) {   /* right and left simultaneously */
+-                      if (last_stick[i] & 0x04)       /* if wasn't left before, move left */
+-                              STICK[i] |= 0x08;
+-                      else                                            /* else move right */
+-                              STICK[i] |= 0x04;
+-              }
+-              else {
+-                      last_stick[i] &= 0x03;
+-                      last_stick[i] |= STICK[i] & 0x0c;
+-              }
+-              if ((STICK[i] & 0x03) == 0) {   /* up and down simultaneously */
+-                      if (last_stick[i] & 0x01)       /* if wasn't up before, move up */
+-                              STICK[i] |= 0x02;
+-                      else                                            /* else move down */
+-                              STICK[i] |= 0x01;
+-              }
+-              else {
+-                      last_stick[i] &= 0x0c;
+-                      last_stick[i] |= STICK[i] & 0x03;
++      for (i = 0; i < 4; i++) {
++              if (joy_block_opposite_directions) {
++                      if ((STICK[i] & 0x0c) == 0) {   /* right and left simultaneously */
++                              if (last_stick[i] & 0x04)       /* if wasn't left before, move left */
++                                      STICK[i] |= 0x08;
++                              else                                            /* else move right */
++                                      STICK[i] |= 0x04;
++                      }
++                      else {
++                              last_stick[i] &= 0x03;
++                              last_stick[i] |= STICK[i] & 0x0c;
++                      }
++                      if ((STICK[i] & 0x03) == 0) {   /* up and down simultaneously */
++                              if (last_stick[i] & 0x01)       /* if wasn't up before, move up */
++                                      STICK[i] |= 0x02;
++                              else                                            /* else move down */
++                                      STICK[i] |= 0x01;
++                      }
++                      else {
++                              last_stick[i] &= 0x0c;
++                              last_stick[i] |= STICK[i] & 0x03;
++                      }
+               }
+-      }
+ 
+-      for (i = 0; i < 4; i++) {
+               last_stick[i] = STICK[i];
+               TRIG[i] = Atari_TRIG(i);
+               if ((joy_autofire[i] == AUTOFIRE_FIRE && !TRIG[i]) || (joy_autofire[i] == AUTOFIRE_CONT))

diff --git a/Atari800.spec b/Atari800.spec
index 7f8b0598c3838d8264f7e79a81eb293d97626833..1b98f23f530508b97845a569574b2f95e0017609 100644 (file)
--- a/Atari800.spec
+++ b/Atari800.spec
@@ -7,7 +7,7 @@ Summary(pl):    Emulator Atari 800
 Name:          Atari800
 %define                ver_short       120
 Version:       1.2.0
-Release:       2
+Release:       3
 License:       GPL (Atari800), distributable if unmodified (xf25 with ROMs)
 Group:         Applications/Emulators
 Group(de):     Applikationen/Emulators
@@ -17,6 +17,7 @@ Source0:      ftp://ftp.sourceforge.net/pub/sourceforge/atari800/a800s%{ver_short}.tg
 Source1:       http://joy.sophics.cz/www/xf25.zip
 Source2:       %{name}-chooser
 Patch0:                %{name}-shm_fix.patch
+Patch1:                %{name}-joystick.patch
 URL:           http://atari800.atari.org/
 BuildRequires: unzip
 BuildRequires: svgalib-devel
@@ -129,6 +130,7 @@ obs
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd src