projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rocksndiamonds-3.0.3
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index d2e5e38f40be8fcf749f708b42d5d3f1b8cb635f..96adfcfebc88f2a50b5dd10670c805136593e617 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;
@@
-120,7
+120,7
@@
void InitPlatformDependantStuff(void)
#endif
}
#endif
}
-void ClosePlatformDepend
a
ntStuff(void)
+void ClosePlatformDepend
e
ntStuff(void)
{
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
{
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
@@
-821,7
+821,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
+838,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
+857,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[] =
{
@@
-940,9
+943,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
+958,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
+1078,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
+1120,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()