projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040430-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index d2e5e38f40be8fcf749f708b42d5d3f1b8cb635f..8f26dc77fb97e7933f5ed2f24c71d453b0dfd5d9 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-107,7
+107,7
@@
void InitExitFunction(void (*exit_function)(int))
#endif
}
#endif
}
-void InitPlatformDepend
a
ntStuff(void)
+void InitPlatformDepend
e
ntStuff(void)
{
#if defined(PLATFORM_MSDOS)
_fmode = O_BINARY;
{
#if defined(PLATFORM_MSDOS)
_fmode = O_BINARY;
@@
-117,10
+117,12
@@
void InitPlatformDependantStuff(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
}
-void ClosePlatformDepend
a
ntStuff(void)
+void ClosePlatformDepend
e
ntStuff(void)
{
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
{
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
@@
-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);
@@
-821,7
+822,7
@@
void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
src_height = src_bitmap->height;
tmp_width = src_width;
src_height = src_bitmap->height;
tmp_width = src_width;
- tmp_height = src_height +
src_height / 2;
+ tmp_height = src_height +
(src_height + 1) / 2; /* prevent odd height */
tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH);
tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH);
@@
-838,9
+839,11
@@
void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
FreeBitmap(tmp_bitmap_8);
#if defined(TARGET_SDL)
FreeBitmap(tmp_bitmap_8);
#if defined(TARGET_SDL)
+ /* !!! what about the old src_bitmap->surface ??? FIX ME !!! */
src_bitmap->surface = tmp_bitmap->surface;
tmp_bitmap->surface = NULL;
#else
src_bitmap->surface = tmp_bitmap->surface;
tmp_bitmap->surface = NULL;
#else
+ /* !!! see above !!! */
src_bitmap->drawable = tmp_bitmap->drawable;
tmp_bitmap->drawable = None;
#endif
src_bitmap->drawable = tmp_bitmap->drawable;
tmp_bitmap->drawable = None;
#endif
@@
-855,6
+858,7
@@
void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
/* mouse pointer functions */
/* ------------------------------------------------------------------------- */
/* mouse pointer functions */
/* ------------------------------------------------------------------------- */
+#if !defined(PLATFORM_MSDOS)
/* XPM */
static const char *cursor_image_playfield[] =
{
/* XPM */
static const char *cursor_image_playfield[] =
{
@@
-866,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 ",
@@
-886,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)
@@
-906,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 );
@@
-940,9
+970,11
@@
static struct MouseCursorInfo *get_cursor_from_image(const char **image)
return cursor;
}
return cursor;
}
+#endif /* !PLATFORM_MSDOS */
void SetMouseCursor(int mode)
{
void SetMouseCursor(int mode)
{
+#if !defined(PLATFORM_MSDOS)
static struct MouseCursorInfo *cursor_playfield = NULL;
if (cursor_playfield == NULL)
static struct MouseCursorInfo *cursor_playfield = NULL;
if (cursor_playfield == NULL)
@@
-953,6
+985,7
@@
void SetMouseCursor(int mode)
#elif defined(TARGET_X11_NATIVE)
X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
#endif
#elif defined(TARGET_X11_NATIVE)
X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
#endif
+#endif
}
}
@@
-1072,9
+1105,9
@@
inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
inline KeyMod HandleKeyModState(Key key, int key_status)
{
inline KeyMod HandleKeyModState(Key key, int key_status)
{
-#if !defined(TARGET_SDL)
static KeyMod current_modifiers = KMOD_None;
static KeyMod current_modifiers = KMOD_None;
+#if !defined(TARGET_SDL)
if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */
{
KeyMod new_modifier = KMOD_None;
if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */
{
KeyMod new_modifier = KMOD_None;
@@
-1114,9
+1147,9
@@
inline KeyMod HandleKeyModState(Key key, int key_status)
else
current_modifiers &= ~new_modifier;
}
else
current_modifiers &= ~new_modifier;
}
+#endif
return current_modifiers;
return current_modifiers;
-#endif
}
inline KeyMod GetKeyModState()
}
inline KeyMod GetKeyModState()
@@
-1159,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)