projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20051213-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 1bc222a958c49c227bfc9fa9a6a23bf853cd8a33..e27c822e60cc5f301a4d291e431d5a1ce461808d 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-248,11
+248,6
@@
inline void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y,
{
Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap);
SDL_Rect rect;
{
Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap);
SDL_Rect rect;
-#if 0
- unsigned int color_r = (color >> 16) & 0xff;
- unsigned int color_g = (color >> 8) & 0xff;
- unsigned int color_b = (color >> 0) & 0xff;
-#endif
#ifdef FULLSCREEN_BUG
if (dst_bitmap == backbuffer || dst_bitmap == window)
#ifdef FULLSCREEN_BUG
if (dst_bitmap == backbuffer || dst_bitmap == window)
@@
-267,13
+262,7
@@
inline void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y,
rect.w = width;
rect.h = height;
rect.w = width;
rect.h = height;
-#if 1
SDL_FillRect(real_dst_bitmap->surface, &rect, color);
SDL_FillRect(real_dst_bitmap->surface, &rect, color);
-#else
- SDL_FillRect(real_dst_bitmap->surface, &rect,
- SDL_MapRGB(real_dst_bitmap->surface->format,
- color_r, color_g, color_b));
-#endif
if (dst_bitmap == window)
SDL_UpdateRect(backbuffer->surface, x, y, width, height);
if (dst_bitmap == window)
SDL_UpdateRect(backbuffer->surface, x, y, width, height);
@@
-284,11
+273,6
@@
inline void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y,
{
SDL_Surface *surface = dst_bitmap->surface;
SDL_Rect rect;
{
SDL_Surface *surface = dst_bitmap->surface;
SDL_Rect rect;
-#if 0
- unsigned int color_r = (color >> 16) & 0xff;
- unsigned int color_g = (color >> 8) & 0xff;
- unsigned int color_b = (color >> 0) & 0xff;
-#endif
if (from_x > to_x)
swap_numbers(&from_x, &to_x);
if (from_x > to_x)
swap_numbers(&from_x, &to_x);
@@
-309,12
+293,7
@@
inline void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y,
}
#endif
}
#endif
-#if 1
SDL_FillRect(surface, &rect, color);
SDL_FillRect(surface, &rect, color);
-#else
- SDL_FillRect(surface, &rect,
- SDL_MapRGB(surface->format, color_r, color_g, color_b));
-#endif
}
inline void SDLDrawLine(Bitmap *dst_bitmap, int from_x, int from_y,
}
inline void SDLDrawLine(Bitmap *dst_bitmap, int from_x, int from_y,
@@
-1440,6
+1419,7
@@
void HandleJoystickEvent(Event *event)
void SDLInitJoysticks()
{
static boolean sdl_joystick_subsystem_initialized = FALSE;
void SDLInitJoysticks()
{
static boolean sdl_joystick_subsystem_initialized = FALSE;
+ boolean print_warning = !sdl_joystick_subsystem_initialized;
int i;
if (!sdl_joystick_subsystem_initialized)
int i;
if (!sdl_joystick_subsystem_initialized)
@@
-1459,11
+1439,19
@@
void SDLInitJoysticks()
int joystick_nr = getJoystickNrFromDeviceName(device_name);
if (joystick_nr >= SDL_NumJoysticks())
int joystick_nr = getJoystickNrFromDeviceName(device_name);
if (joystick_nr >= SDL_NumJoysticks())
+ {
+ if (setup.input[i].use_joystick && print_warning)
+ Error(ERR_WARN, "cannot find joystick %d", joystick_nr);
+
joystick_nr = -1;
joystick_nr = -1;
+ }
/* misuse joystick file descriptor variable to store joystick number */
joystick.fd[i] = joystick_nr;
/* misuse joystick file descriptor variable to store joystick number */
joystick.fd[i] = joystick_nr;
+ if (joystick_nr == -1)
+ continue;
+
/* this allows subsequent calls to 'InitJoysticks' for re-initialization */
if (SDLCheckJoystickOpened(joystick_nr))
SDLCloseJoystick(joystick_nr);
/* this allows subsequent calls to 'InitJoysticks' for re-initialization */
if (SDLCheckJoystickOpened(joystick_nr))
SDLCloseJoystick(joystick_nr);
@@
-1473,7
+1461,9
@@
void SDLInitJoysticks()
if (!SDLOpenJoystick(joystick_nr))
{
if (!SDLOpenJoystick(joystick_nr))
{
- Error(ERR_WARN, "cannot open joystick %d", joystick_nr);
+ if (print_warning)
+ Error(ERR_WARN, "cannot open joystick %d", joystick_nr);
+
continue;
}
continue;
}