projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040619-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 96adfcfebc88f2a50b5dd10670c805136593e617..8f26dc77fb97e7933f5ed2f24c71d453b0dfd5d9 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-117,6
+117,8
@@
void InitPlatformDependentStuff(void)
#if defined(TARGET_SDL)
if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
#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
}
#endif
}
@@
-194,9
+196,9
@@
static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile,
int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize;
int x, y;
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;
{
int draw_x = dest_x + x * tile_xsize;
int draw_y = dest_y + y * tile_ysize;
@@
-370,8
+372,7
@@
inline static void FreeBitmapPointers(Bitmap *bitmap)
X11FreeBitmapPointers(bitmap);
#endif
X11FreeBitmapPointers(bitmap);
#endif
- if (bitmap->source_filename)
- free(bitmap->source_filename);
+ checked_free(bitmap->source_filename);
bitmap->source_filename = NULL;
}
bitmap->source_filename = NULL;
}
@@
-559,9
+560,9
@@
inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
{
int x, y;
{
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 dx = x - line_width / 2;
int dy = y - line_width / 2;
@@
-591,7
+592,7
@@
inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
int line_width = 4;
int i;
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);
DrawLine(bitmap, points[i].x, points[i].y,
points[i + 1].x, points[i + 1].y, pixel, line_width);
@@
-869,6
+870,31
@@
static const char *cursor_image_playfield[] =
". c #ffffff",
" c None",
". 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 ",
/* pixels */
" X ",
"X.X ",
@@
-889,6
+915,7
@@
static const char *cursor_image_playfield[] =
/* hot spot */
"1,1"
/* hot spot */
"1,1"
+#endif
};
#if defined(TARGET_SDL)
};
#if defined(TARGET_SDL)
@@
-909,9
+936,9
@@
static struct MouseCursorInfo *get_cursor_from_image(const char **image)
sscanf(image[0], " %d %d ", &cursor->width, &cursor->height);
i = -1;
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 );
{
int bit_nr = x % 8;
int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr );
@@
-1165,7
+1192,7
@@
inline void InitJoysticks()
/* always start with reliable default values */
joystick.status = JOYSTICK_NOT_AVAILABLE;
/* 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)
joystick.fd[i] = -1; /* joystick device closed */
#if defined(TARGET_SDL)