#if defined(TARGET_SDL)
if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
+
+ SDLNet_Init();
#endif
}
int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize;
int x, y;
- for (y=0; y < tile_ysteps; y++)
+ for (y = 0; y < tile_ysteps; y++)
{
- for (x=0; x < tile_xsteps; x++)
+ for (x = 0; x < tile_xsteps; x++)
{
int draw_x = dest_x + x * tile_xsize;
int draw_y = dest_y + y * tile_ysize;
X11FreeBitmapPointers(bitmap);
#endif
- if (bitmap->source_filename)
- free(bitmap->source_filename);
+ checked_free(bitmap->source_filename);
bitmap->source_filename = NULL;
}
{
int x, y;
- for (x=0; x<line_width; x++)
+ for (x = 0; x < line_width; x++)
{
- for (y=0; y<line_width; y++)
+ for (y = 0; y < line_width; y++)
{
int dx = x - line_width / 2;
int dy = y - line_width / 2;
int line_width = 4;
int i;
- for (i=0; i<num_points - 1; i++)
+ for (i = 0; i < num_points - 1; i++)
DrawLine(bitmap, points[i].x, points[i].y,
points[i + 1].x, points[i + 1].y, pixel, line_width);
void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
{
+ Bitmap swap_bitmap;
Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8;
int src_width, src_height;
int tmp_width, tmp_height;
FreeBitmap(tmp_bitmap_2);
FreeBitmap(tmp_bitmap_8);
+#if 0
+
#if defined(TARGET_SDL)
/* !!! what about the old src_bitmap->surface ??? FIX ME !!! */
src_bitmap->surface = tmp_bitmap->surface;
/* !!! see above !!! */
src_bitmap->drawable = tmp_bitmap->drawable;
tmp_bitmap->drawable = None;
+#endif
+
+#else
+
+#if defined(TARGET_SDL)
+ swap_bitmap.surface = src_bitmap->surface;
+ src_bitmap->surface = tmp_bitmap->surface;
+ tmp_bitmap->surface = swap_bitmap.surface;
+#else
+ swap_bitmap.drawable = src_bitmap->drawable;
+ src_bitmap->drawable = tmp_bitmap->drawable;
+ tmp_bitmap->drawable = swap_bitmap.drawable;
+#endif
+
#endif
src_bitmap->height = tmp_bitmap->height;
/* mouse pointer functions */
/* ------------------------------------------------------------------------- */
+#if !defined(PLATFORM_MSDOS)
/* XPM */
static const char *cursor_image_playfield[] =
{
". c #ffffff",
" c None",
+#if 1
+ /* some people complained about a "white dot" on the screen and thought it
+ was a graphical error... OK, let's just remove the whole pointer :-) */
+
+ /* pixels */
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+
+ /* hot spot */
+ "0,0"
+#else
/* pixels */
" X ",
"X.X ",
/* hot spot */
"1,1"
+#endif
};
#if defined(TARGET_SDL)
sscanf(image[0], " %d %d ", &cursor->width, &cursor->height);
i = -1;
- for (y=0; y < cursor->width; y++)
+ for (y = 0; y < cursor->width; y++)
{
- for (x=0; x < cursor->height; x++)
+ for (x = 0; x < cursor->height; x++)
{
int bit_nr = x % 8;
int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr );
return cursor;
}
+#endif /* !PLATFORM_MSDOS */
void SetMouseCursor(int mode)
{
+#if !defined(PLATFORM_MSDOS)
static struct MouseCursorInfo *cursor_playfield = NULL;
if (cursor_playfield == NULL)
#elif defined(TARGET_X11_NATIVE)
X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
#endif
+#endif
}
/* always start with reliable default values */
joystick.status = JOYSTICK_NOT_AVAILABLE;
- for (i=0; i<MAX_PLAYERS; i++)
+ for (i = 0; i < MAX_PLAYERS; i++)
joystick.fd[i] = -1; /* joystick device closed */
#if defined(TARGET_SDL)