From: Holger Schemel Date: Mon, 4 Aug 2003 21:03:15 +0000 (+0200) Subject: rnd-20030804-2-src X-Git-Tag: 3.0.0^2~1 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=34ca525d659f14cec647449f4be8ee009a5bc267;p=rocksndiamonds.git rnd-20030804-2-src --- diff --git a/src/conftime.h b/src/conftime.h index 249e2ce3..262d1286 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-08-04 22:16]" +#define COMPILE_DATE_STRING "[2003-08-04 23:02]" diff --git a/src/libgame/misc.c b/src/libgame/misc.c index cb79ee22..f6cc110d 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -333,6 +333,7 @@ unsigned int get_random_number(int nr, unsigned int max) /* system info functions */ /* ------------------------------------------------------------------------- */ +#if !defined(PLATFORM_MSDOS) static char *get_corrected_real_name(char *real_name) { char *real_name_new = checked_malloc(MAX_USERNAME_LEN + 1); @@ -365,6 +366,7 @@ static char *get_corrected_real_name(char *real_name) return real_name_new; } +#endif char *getLoginName() { diff --git a/src/libgame/system.c b/src/libgame/system.c index 4a4c4d35..96adfcfe 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -857,6 +857,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) /* mouse pointer functions */ /* ------------------------------------------------------------------------- */ +#if !defined(PLATFORM_MSDOS) /* XPM */ static const char *cursor_image_playfield[] = { @@ -942,9 +943,11 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) return cursor; } +#endif /* !PLATFORM_MSDOS */ void SetMouseCursor(int mode) { +#if !defined(PLATFORM_MSDOS) static struct MouseCursorInfo *cursor_playfield = NULL; if (cursor_playfield == NULL) @@ -955,6 +958,7 @@ void SetMouseCursor(int mode) #elif defined(TARGET_X11_NATIVE) X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); #endif +#endif } diff --git a/src/libgame/x11.c b/src/libgame/x11.c index 38365464..d7acc801 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -404,6 +404,7 @@ inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y) return pixel_value; } +#if defined(TARGET_X11_NATIVE) inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g, unsigned int color_b) { @@ -420,6 +421,8 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g, return pixel; } +#endif /* TARGET_X11_NATIVE */ + /* ------------------------------------------------------------------------- */ /* mouse pointer functions */