X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=4a4c4d352e077da8bc0152e349a08220a01ef0ca;hb=76510834f382bc82548e72c8e7f6f7672c9484dc;hp=d2e5e38f40be8fcf749f708b42d5d3f1b8cb635f;hpb=12a224578d49391c7c4c27ad898059ae17e9b880;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index d2e5e38f..4a4c4d35 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -107,7 +107,7 @@ void InitExitFunction(void (*exit_function)(int)) #endif } -void InitPlatformDependantStuff(void) +void InitPlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; @@ -120,7 +120,7 @@ void InitPlatformDependantStuff(void) #endif } -void ClosePlatformDependantStuff(void) +void ClosePlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) dumpErrorFile(); @@ -821,7 +821,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) 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); @@ -838,9 +838,11 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) 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 + /* !!! see above !!! */ src_bitmap->drawable = tmp_bitmap->drawable; tmp_bitmap->drawable = None; #endif @@ -1072,9 +1074,9 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) inline KeyMod HandleKeyModState(Key key, int key_status) { -#if !defined(TARGET_SDL) 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; @@ -1114,9 +1116,9 @@ inline KeyMod HandleKeyModState(Key key, int key_status) else current_modifiers &= ~new_modifier; } +#endif return current_modifiers; -#endif } inline KeyMod GetKeyModState()