From 6dda41cbc78efacf1e345ba2821d7e551bc34486 Mon Sep 17 00:00:00 2001
From: Miro Kropacek <[EMAIL REDACTED]>
Date: Sat, 20 Apr 2019 22:08:39 +0200
Subject: [PATCH] atari: there is no reason why SDL_AtariXbios_enabled
shouldn't be a SDL_bool
---
src/joystick/mint/SDL_sysjoystick.c | 4 ++--
src/video/ataricommon/SDL_xbiosevents.c | 10 +++++-----
src/video/ataricommon/SDL_xbiosevents_c.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c
index 9a3615292..e525508b6 100644
--- a/src/joystick/mint/SDL_sysjoystick.c
+++ b/src/joystick/mint/SDL_sysjoystick.c
@@ -300,7 +300,7 @@ int SDL_SYS_JoystickInit(void)
atarijoysticks[PORTB_PAD3].enabled = SDL_TRUE;
}
if (!atarijoysticks[IKBD_JOY1].enabled) {
- atarijoysticks[XBIOS_JOY1].enabled=(SDL_AtariXbios_enabled!=0);
+ atarijoysticks[XBIOS_JOY1].enabled=SDL_AtariXbios_enabled;
}
/* Read environment for joysticks to enable */
@@ -339,7 +339,7 @@ int SDL_SYS_JoystickInit(void)
}
if (!atarijoysticks[IKBD_JOY1].enabled) {
- if (SDL_AtariXbios_enabled!=0) {
+ if (SDL_AtariXbios_enabled) {
TEST_JOY_ENABLED(envr, "xbios-joy1", XBIOS_JOY1);
}
}
diff --git a/src/video/ataricommon/SDL_xbiosevents.c b/src/video/ataricommon/SDL_xbiosevents.c
index 232500f7a..2bb0bc9a6 100644
--- a/src/video/ataricommon/SDL_xbiosevents.c
+++ b/src/video/ataricommon/SDL_xbiosevents.c
@@ -36,7 +36,7 @@
/* Variables */
-int SDL_AtariXbios_enabled=0;
+SDL_bool SDL_AtariXbios_enabled=SDL_FALSE;
/* Local variables */
@@ -58,7 +58,7 @@ void SDL_AtariXbios_InstallVectors(int vectors_mask)
atari_prevmouseb = 0;
if (vectors_mask==0) {
- SDL_AtariXbios_enabled=0;
+ SDL_AtariXbios_enabled=SDL_FALSE;
return;
}
@@ -78,14 +78,14 @@ void SDL_AtariXbios_InstallVectors(int vectors_mask)
/* Back to user mode */
SuperToUser(oldpile);
- SDL_AtariXbios_enabled=1;
+ SDL_AtariXbios_enabled=SDL_TRUE;
}
void SDL_AtariXbios_RestoreVectors(void)
{
void *oldpile;
- if (SDL_AtariXbios_enabled==0) {
+ if (!SDL_AtariXbios_enabled) {
return;
}
@@ -118,7 +118,7 @@ static int atari_GetButton(int button)
void SDL_AtariXbios_PostMouseEvents(_THIS, SDL_bool buttonEvents)
{
- if (SDL_AtariXbios_enabled==0) {
+ if (!SDL_AtariXbios_enabled) {
return;
}
diff --git a/src/video/ataricommon/SDL_xbiosevents_c.h b/src/video/ataricommon/SDL_xbiosevents_c.h
index 374b06280..40a433086 100644
--- a/src/video/ataricommon/SDL_xbiosevents_c.h
+++ b/src/video/ataricommon/SDL_xbiosevents_c.h
@@ -38,7 +38,7 @@
#define ATARI_XBIOS_MOUSEEVENTS (1<<0)
#define ATARI_XBIOS_JOYSTICKEVENTS (1<<1)
-extern int SDL_AtariXbios_enabled;
+extern SDL_bool SDL_AtariXbios_enabled;
extern void SDL_AtariXbios_InstallVectors(int vectors_mask);
extern void SDL_AtariXbios_RestoreVectors(void);