projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiler warning by adding missing variable initialization
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index ee43dc05b0c1b1795328b129d1ca0a563f0398e2..214859df78ef187e584ce4b42837b653a0f6e0f4 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-532,11
+532,7
@@
inline static void SDLInitVideoBuffer_VideoBuffer(boolean fullscreen)
SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
-#if defined(TARGET_SDL2)
- SDL_SetWindowTitle(sdl_window, program.window_title);
-#else
- SDL_WM_SetCaption(program.window_title, program.window_title);
-#endif
+ SDLSetWindowTitle();
}
inline static void SDLInitVideoBuffer_DrawBuffer()
}
inline static void SDLInitVideoBuffer_DrawBuffer()
@@
-830,6
+826,9
@@
boolean SDLSetVideoMode(boolean fullscreen)
void SDLSetWindowTitle()
{
#if defined(TARGET_SDL2)
void SDLSetWindowTitle()
{
#if defined(TARGET_SDL2)
+ if (sdl_window == NULL)
+ return;
+
SDL_SetWindowTitle(sdl_window, program.window_title);
#else
SDL_WM_SetCaption(program.window_title, program.window_title);
SDL_SetWindowTitle(sdl_window, program.window_title);
#else
SDL_WM_SetCaption(program.window_title, program.window_title);
@@
-2601,9
+2600,24
@@
static int sdl_js_axis[MAX_PLAYERS][2];
static int sdl_js_button[MAX_PLAYERS][2];
static boolean sdl_is_controller[MAX_PLAYERS];
static int sdl_js_button[MAX_PLAYERS][2];
static boolean sdl_is_controller[MAX_PLAYERS];
-static boolean SDLOpenJoystick(int nr)
+void SDLClearJoystickState()
+{
+ int i, j;
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ {
+ for (j = 0; j < 2; j++)
+ {
+ sdl_js_axis_raw[i][j] = -1;
+ sdl_js_axis[i][j] = 0;
+ sdl_js_button[i][j] = 0;
+ }
+ }
+}
+
+boolean SDLOpenJoystick(int nr)
{
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ if (nr < 0 || nr >
=
MAX_PLAYERS)
return FALSE;
#if defined(TARGET_SDL2)
return FALSE;
#if defined(TARGET_SDL2)
@@
-2629,9
+2643,9
@@
static boolean SDLOpenJoystick(int nr)
return (sdl_joystick[nr] != NULL);
}
return (sdl_joystick[nr] != NULL);
}
-
static
void SDLCloseJoystick(int nr)
+void SDLCloseJoystick(int nr)
{
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ if (nr < 0 || nr >
=
MAX_PLAYERS)
return;
#if 1
return;
#if 1
@@
-2648,18
+2662,11
@@
static void SDLCloseJoystick(int nr)
#endif
sdl_joystick[nr] = NULL;
#endif
sdl_joystick[nr] = NULL;
-
- sdl_js_axis_raw[nr][0] = -1;
- sdl_js_axis_raw[nr][1] = -1;
- sdl_js_axis[nr][0] = 0;
- sdl_js_axis[nr][1] = 0;
- sdl_js_button[nr][0] = 0;
- sdl_js_button[nr][1] = 0;
}
boolean SDLCheckJoystickOpened(int nr)
{
}
boolean SDLCheckJoystickOpened(int nr)
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ if (nr < 0 || nr >
=
MAX_PLAYERS)
return FALSE;
#if defined(TARGET_SDL2)
return FALSE;
#if defined(TARGET_SDL2)
@@
-2680,6
+2687,9
@@
static void setJoystickAxis(int nr, int axis_id_raw, int axis_value)
int axis_id = axis_id_raw % 2;
#endif
int axis_id = axis_id_raw % 2;
#endif
+ if (nr < 0 || nr >= MAX_PLAYERS)
+ return;
+
if (axis_id == -1)
return;
if (axis_id == -1)
return;
@@
-2723,6
+2733,9
@@
static void setJoystickButton(int nr, int button_id_raw, int button_state)
int button_id = button_id_raw % 2;
#endif
int button_id = button_id_raw % 2;
#endif
+ if (nr < 0 || nr >= MAX_PLAYERS)
+ return;
+
if (button_id == -1)
return;
if (button_id == -1)
return;
@@
-2833,7
+2846,7
@@
void SDLInitJoysticks()
static boolean sdl_joystick_subsystem_initialized = FALSE;
boolean print_warning = !sdl_joystick_subsystem_initialized;
#if defined(TARGET_SDL2)
static boolean sdl_joystick_subsystem_initialized = FALSE;
boolean print_warning = !sdl_joystick_subsystem_initialized;
#if defined(TARGET_SDL2)
- char *mappings_file_base = getPath2(options.
ro_base
_directory,
+ char *mappings_file_base = getPath2(options.
conf
_directory,
GAMECONTROLLER_BASENAME);
char *mappings_file_user = getPath2(getUserGameDataDir(),
GAMECONTROLLER_BASENAME);
GAMECONTROLLER_BASENAME);
char *mappings_file_user = getPath2(getUserGameDataDir(),
GAMECONTROLLER_BASENAME);
@@
-2913,8
+2926,8
@@
void SDLInitJoysticks()
joystick_nr = -1;
}
joystick_nr = -1;
}
- /*
misuse joystick file descriptor variable to store joystick numb
er */
- joystick.
fd
[i] = joystick_nr;
+ /*
store configured joystick number for each play
er */
+ joystick.
nr
[i] = joystick_nr;
}
/* now open all connected joysticks (regardless if configured or not) */
}
/* now open all connected joysticks (regardless if configured or not) */
@@
-2929,6
+2942,8
@@
void SDLInitJoysticks()
else if (print_warning)
Error(ERR_WARN, "cannot open joystick %d", i);
}
else if (print_warning)
Error(ERR_WARN, "cannot open joystick %d", i);
}
+
+ SDLClearJoystickState();
}
boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
}
boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
@@
-2949,6
+2964,11
@@
boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
return TRUE;
}
return TRUE;
}
+
+/* ========================================================================= */
+/* touch input overlay functions */
+/* ========================================================================= */
+
#if defined(USE_TOUCH_INPUT_OVERLAY)
static void DrawTouchInputOverlay()
{
#if defined(USE_TOUCH_INPUT_OVERLAY)
static void DrawTouchInputOverlay()
{
@@
-2960,11
+2980,12
@@
static void DrawTouchInputOverlay()
static int alpha_step = 5;
static int alpha_last = 0;
static int alpha = 0;
static int alpha_step = 5;
static int alpha_last = 0;
static int alpha = 0;
+ boolean active = (overlay.enabled && overlay.active);
- if (!
overlay.
active && deactivated)
+ if (!active && deactivated)
return;
return;
- if (
overlay.
active)
+ if (active)
{
if (alpha < alpha_max)
alpha = MIN(alpha + alpha_step, alpha_max);
{
if (alpha < alpha_max)
alpha = MIN(alpha + alpha_step, alpha_max);