projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060407-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index b127c7844055152de46fc5f8474abd93c5be1237..a6afa2826e4d7bc7974c190f7add63dcb3f49bd0 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,
@@
-1305,7
+1284,7
@@
void SDLSetMouseCursor(struct MouseCursorInfo *cursor_info)
inline void SDLOpenAudio(void)
{
inline void SDLOpenAudio(void)
{
- if (
strcmp(setup.system.sdl_audiodriver, ARG_DEFAULT) != 0
)
+ if (
!strEqual(setup.system.sdl_audiodriver, ARG_DEFAULT)
)
putenv(getStringCat2("SDL_AUDIODRIVER=", setup.system.sdl_audiodriver));
if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
putenv(getStringCat2("SDL_AUDIODRIVER=", setup.system.sdl_audiodriver));
if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
@@
-1456,6
+1435,7
@@
void SDLInitJoysticks()
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
+ /* get configured joystick for this player */
char *device_name = setup.input[i].joy.device_name;
int joystick_nr = getJoystickNrFromDeviceName(device_name);
char *device_name = setup.input[i].joy.device_name;
int joystick_nr = getJoystickNrFromDeviceName(device_name);