X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=1e628241f9eedb648019b17d71940aeb75ca3579;hb=72657dfeee6b6c184a42e83ed923a63c1768100b;hp=c071fee890f37242231dc8c7bbcaaadfe2da8dc7;hpb=14089dac2cbe56e563863e1e5adb8847944fd262;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index c071fee8..1e628241 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -36,7 +36,6 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; -struct FontInfo font; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; @@ -67,10 +66,31 @@ int FrameCounter = 0; /* init/close functions */ /* ========================================================================= */ -void InitCommandName(char *argv0) +void InitProgramInfo(char *argv0, + char *userdata_directory, char *program_title, + char *window_title, char *icon_title, + char *x11_icon_filename, char *x11_iconmask_filename, + char *msdos_pointer_filename, + char *cookie_prefix, char *filename_prefix, + int program_version) { program.command_basename = (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0); + + program.userdata_directory = userdata_directory; + program.program_title = program_title; + program.window_title = window_title; + program.icon_title = icon_title; + program.x11_icon_filename = x11_icon_filename; + program.x11_iconmask_filename = x11_iconmask_filename; + program.msdos_pointer_filename = msdos_pointer_filename; + + program.cookie_prefix = cookie_prefix; + program.filename_prefix = filename_prefix; + + program.version_major = VERSION_MAJOR(program_version); + program.version_minor = VERSION_MINOR(program_version); + program.version_patch = VERSION_PATCH(program_version); } void InitExitFunction(void (*exit_function)(int)) @@ -91,13 +111,6 @@ void InitPlatformDependantStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; -#endif - -#if !defined(PLATFORM_UNIX) - program.userdata_directory = "userdata"; -#endif - -#if defined(PLATFORM_MSDOS) initErrorFile(); #endif @@ -114,34 +127,6 @@ void ClosePlatformDependantStuff(void) #endif } -void InitProgramInfo(char *unix_userdata_directory, char *program_title, - char *window_title, char *icon_title, - char *x11_icon_filename, char *x11_iconmask_filename, - char *msdos_pointer_filename, - char *cookie_prefix, char *filename_prefix, - int program_version) -{ -#if defined(PLATFORM_UNIX) - program.userdata_directory = unix_userdata_directory; -#else - program.userdata_directory = "userdata"; -#endif - - program.program_title = program_title; - program.window_title = window_title; - program.icon_title = icon_title; - program.x11_icon_filename = x11_icon_filename; - program.x11_iconmask_filename = x11_iconmask_filename; - program.msdos_pointer_filename = msdos_pointer_filename; - - program.cookie_prefix = cookie_prefix; - program.filename_prefix = filename_prefix; - - program.version_major = VERSION_MAJOR(program_version); - program.version_minor = VERSION_MINOR(program_version); - program.version_patch = VERSION_PATCH(program_version); -} - void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, int real_sx, int real_sy, int full_sxsize, int full_sysize) @@ -155,7 +140,11 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.full_sxsize = full_sxsize; gfx.full_sysize = full_sysize; + gfx.background_bitmap = NULL; + gfx.background_bitmap_mask = REDRAW_NONE; + SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ + SetDrawBackgroundMask(REDRAW_NONE); /* deactivate masked drawing */ } void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize) @@ -186,9 +175,88 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } -void SetBackgroundBitmap(Bitmap *background_bitmap) +void SetDrawBackgroundMask(int draw_background_mask) { - gfx.background_bitmap = background_bitmap; + gfx.draw_background_mask = draw_background_mask; +} + +static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, + int dest_x, int dest_y, int width, int height) +{ + int bitmap_xsize = width; + int bitmap_ysize = height; + int tile_xsize = tile->width; + int tile_ysize = tile->height; + int tile_xsteps = (bitmap_xsize + tile_xsize - 1) / tile_xsize; + int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize; + int x, y; + + for (y=0; y < tile_ysteps; y++) + { + 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_xsize = MIN(tile_xsize, bitmap_xsize - x * tile_xsize); + int draw_ysize = MIN(tile_ysize, bitmap_ysize - y * tile_ysize); + + BlitBitmap(tile, bitmap, 0, 0, draw_xsize, draw_ysize, draw_x, draw_y); + } + } +} + +void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +{ + static Bitmap *main_bitmap_tile = NULL; + static Bitmap *door_bitmap_tile = NULL; + + if (mask == REDRAW_FIELD) + { + if (background_bitmap_tile == main_bitmap_tile) + return; /* main background tile has not changed */ + + main_bitmap_tile = background_bitmap_tile; + } + else if (mask == REDRAW_DOOR_1) + { + if (background_bitmap_tile == door_bitmap_tile) + return; /* main background tile has not changed */ + + door_bitmap_tile = background_bitmap_tile; + } + else /* should not happen */ + return; + + if (background_bitmap_tile) + gfx.background_bitmap_mask |= mask; + else + gfx.background_bitmap_mask &= ~mask; + + if (gfx.background_bitmap == NULL) + gfx.background_bitmap = CreateBitmap(video.width, video.height, + DEFAULT_DEPTH); + + if (background_bitmap_tile == NULL) /* empty background requested */ + return; + + if (mask == REDRAW_FIELD) + DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, + gfx.real_sx, gfx.real_sy, + gfx.full_sxsize, gfx.full_sysize); + else + DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, + gfx.dx, gfx.dy, + gfx.dxsize, gfx.dysize); +} + +void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) +{ + SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD); +} + +void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile) +{ + SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1); } @@ -287,6 +355,9 @@ inline Bitmap *CreateBitmap(int width, int height, int depth) new_bitmap->line_gc[1] = window->line_gc[1]; #endif + new_bitmap->width = width; + new_bitmap->height = height; + return new_bitmap; } @@ -304,7 +375,7 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) bitmap->surface_masked = NULL; #else /* The X11 version seems to have a memory leak here -- although - "XFreePixmap()" is called, the correspondig memory seems not + "XFreePixmap()" is called, the corresponding memory seems not to be freed (according to "ps"). The SDL version apparently does not have this problem. */ @@ -359,33 +430,36 @@ inline void CloseWindow(DrawWindow *window) #endif } -inline boolean DrawingDeactivated(int x, int y, int width, int height) +static inline boolean CheckDrawingArea(int x, int y, int width, int height, + int draw_mask) { - if (gfx.draw_deactivation_mask != REDRAW_NONE) - { - if (gfx.draw_deactivation_mask & REDRAW_ALL) - return TRUE; - else if ((gfx.draw_deactivation_mask & REDRAW_FIELD) && - x < gfx.sx + gfx.sxsize) - return TRUE; - else if ((gfx.draw_deactivation_mask & REDRAW_DOORS) && - x > gfx.dx) - { - if ((gfx.draw_deactivation_mask & REDRAW_DOOR_1) && - y < gfx.dy + gfx.dysize) - return TRUE; - else if ((gfx.draw_deactivation_mask & REDRAW_DOOR_2) && - y > gfx.vy) - return TRUE; - } - } + if (draw_mask == REDRAW_NONE) + return FALSE; + + if (draw_mask & REDRAW_ALL) + return TRUE; + + if ((draw_mask & REDRAW_FIELD) && x < gfx.real_sx + gfx.full_sxsize) + return TRUE; + + if ((draw_mask & REDRAW_DOOR_1) && x >= gfx.dx && y < gfx.dy + gfx.dysize) + return TRUE; + + if ((draw_mask & REDRAW_DOOR_2) && x >= gfx.dx && y >= gfx.vy) + return TRUE; return FALSE; } +inline boolean DrawingDeactivated(int x, int y, int width, int height) +{ + return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask); +} + inline boolean DrawingOnBackground(int x, int y) { - return (gfx.background_bitmap != NULL && x < gfx.sx + gfx.sxsize); + return ((gfx.draw_background_mask & gfx.background_bitmap_mask) && + CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask)); } inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, @@ -420,11 +494,10 @@ inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, int width, int height) { - if (!DrawingOnBackground(x, y)) - ClearRectangle(bitmap, x, y, width, height); + if (DrawingOnBackground(x, y)) + BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y); else - BlitBitmap(gfx.background_bitmap, bitmap, - x - gfx.real_sx, y - gfx.real_sy, width, height, x, y); + ClearRectangle(bitmap, x, y, width, height); } #if 0 @@ -483,14 +556,10 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, int width, int height, int dst_x, int dst_y) { - if (!DrawingOnBackground(src_x, src_y)) - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, width, height, - dst_x, dst_y); - else + if (DrawingOnBackground(dst_x, dst_y)) { /* draw background */ - BlitBitmap(gfx.background_bitmap, dst_bitmap, - dst_x - gfx.real_sx, dst_y - gfx.real_sy, width, height, + BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, dst_x, dst_y); /* draw foreground */ @@ -499,6 +568,9 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y); } + else + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y); } inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, @@ -777,6 +849,58 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) free(new_bitmap); } +Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) +{ + Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH); + +#if defined(TARGET_SDL) + SDLZoomBitmap(src_bitmap, dst_bitmap); +#else + X11ZoomBitmap(src_bitmap, dst_bitmap); +#endif + + return dst_bitmap; +} + +void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) +{ + Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8; + int src_width, src_height; + int tmp_width, tmp_height; + + src_width = src_bitmap->width; + src_height = src_bitmap->height; + + tmp_width = src_width; + tmp_height = src_height + src_height / 2; + + tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + + tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); + tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + + BlitBitmap(src_bitmap, tmp_bitmap, 0, 0, src_width, src_height, 0, 0); + BlitBitmap(tmp_bitmap_2, tmp_bitmap, 0, 0, src_width / 2, src_height / 2, + 0, src_height); + BlitBitmap(tmp_bitmap_8, tmp_bitmap, 0, 0, src_width / 8, src_height / 8, + 3 * src_width / 4, src_height); + + FreeBitmap(tmp_bitmap_2); + FreeBitmap(tmp_bitmap_8); + +#ifdef TARGET_SDL + src_bitmap->surface = tmp_bitmap->surface; + tmp_bitmap->surface = NULL; +#else + src_bitmap->drawable = tmp_bitmap->drawable; + tmp_bitmap->drawable = None; +#endif + + src_bitmap->height = tmp_bitmap->height; + + FreeBitmap(tmp_bitmap); +} + /* ========================================================================= */ /* audio functions */ @@ -793,7 +917,7 @@ inline void OpenAudio(void) audio.sound_deactivated = FALSE; audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; - audio.mixer_pid = -1; + audio.mixer_pid = 0; audio.device_name = NULL; audio.device_fd = -1;