X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=0131c133e7543bb252a2fd76963ce794582b4984;hb=f4b305df0ae775ef48daee86020904abb79ebef8;hp=497f7e0b26741e90efd50e7b90996960a0804757;hpb=a1bc27d0855dc6fa72c4c361fc1671b2dcc6547b;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 497f7e0b..0131c133 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -40,8 +40,8 @@ struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; -struct LevelDirInfo *leveldir_first = NULL; -struct LevelDirInfo *leveldir_current = NULL; +LevelDirTree *leveldir_first = NULL; +LevelDirTree *leveldir_current = NULL; int level_nr; Display *display = NULL; @@ -94,6 +94,9 @@ void InitPlatformDependantStuff(void) #if !defined(PLATFORM_UNIX) program.userdata_directory = "userdata"; +#endif + +#if defined(PLATFORM_MSDOS) initErrorFile(); #endif @@ -105,25 +108,18 @@ void InitPlatformDependantStuff(void) void ClosePlatformDependantStuff(void) { -#if !defined(PLATFORM_UNIX) +#if defined(PLATFORM_MSDOS) dumpErrorFile(); #endif } void InitProgramInfo(char *unix_userdata_directory, char *program_title, char *window_title, char *icon_title, - char *x11_icon_basename, char *x11_iconmask_basename, - char *msdos_pointer_basename, + char *x11_icon_filename, char *x11_iconmask_filename, + char *msdos_pointer_filename, char *cookie_prefix, char *filename_prefix, int program_version) { - char *x11_icon_filename = - getPath2(options.graphics_directory, x11_icon_basename); - char *x11_iconmask_filename = - getPath2(options.graphics_directory, x11_iconmask_basename); - char *msdos_pointer_filename = - getPath2(options.graphics_directory, msdos_pointer_basename); - #if defined(PLATFORM_UNIX) program.userdata_directory = unix_userdata_directory; #else @@ -158,7 +154,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) @@ -189,6 +189,90 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } +void SetDrawBackgroundMask(int draw_background_mask) +{ + 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); +} + /* ========================================================================= */ /* video functions */ @@ -215,6 +299,7 @@ inline void CloseVideoDisplay(void) #if defined(TARGET_SDL) SDL_QuitSubSystem(SDL_INIT_VIDEO); #else + if (display) XCloseDisplay(display); #endif @@ -284,10 +369,13 @@ 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; } -inline void FreeBitmap(Bitmap *bitmap) +inline static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -297,17 +385,48 @@ inline void FreeBitmap(Bitmap *bitmap) SDL_FreeSurface(bitmap->surface); if (bitmap->surface_masked) SDL_FreeSurface(bitmap->surface_masked); + bitmap->surface = NULL; + bitmap->surface_masked = NULL; #else + /* The X11 version seems to have a memory leak here -- although + "XFreePixmap()" is called, the corresponding memory seems not + to be freed (according to "ps"). The SDL version apparently + does not have this problem. */ + if (bitmap->drawable) XFreePixmap(display, bitmap->drawable); if (bitmap->clip_mask) XFreePixmap(display, bitmap->clip_mask); if (bitmap->stored_clip_gc) XFreeGC(display, bitmap->stored_clip_gc); + /* the other GCs are only pointers to GCs used elsewhere */ + bitmap->drawable = None; + bitmap->clip_mask = None; + bitmap->stored_clip_gc = None; #endif if (bitmap->source_filename) free(bitmap->source_filename); + bitmap->source_filename = NULL; +} + +inline static void TransferBitmapPointers(Bitmap *src_bitmap, + Bitmap *dst_bitmap) +{ + if (src_bitmap == NULL || dst_bitmap == NULL) + return; + + FreeBitmapPointers(dst_bitmap); + + *dst_bitmap = *src_bitmap; +} + +inline void FreeBitmap(Bitmap *bitmap) +{ + if (bitmap == NULL) + return; + + FreeBitmapPointers(bitmap); free(bitmap); } @@ -325,18 +444,38 @@ 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_FIELD) && - x < gfx.sx + gfx.sxsize) - 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.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, int src_x, int src_y, int width, int height, @@ -366,6 +505,15 @@ inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) #endif } +inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, + int width, int height) +{ + if (DrawingOnBackground(x, y)) + BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y); + else + ClearRectangle(bitmap, x, y, width, height); +} + #if 0 #ifndef TARGET_SDL static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ @@ -417,6 +565,28 @@ inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, #endif } +inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, + int width, int height, + int dst_x, int dst_y) +{ + if (DrawingOnBackground(dst_x, dst_y)) + { + /* draw background */ + BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, + dst_x, dst_y); + + /* draw foreground */ + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + 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, int to_x, int to_y) { @@ -634,22 +804,117 @@ Bitmap *LoadImage(char *filename) new_bitmap = X11LoadImage(filename); #endif + if (new_bitmap) + new_bitmap->source_filename = getStringCopy(filename); + return new_bitmap; } Bitmap *LoadCustomImage(char *basename) { - char *filename = getStringCopy(getCustomImageFilename(basename)); + char *filename = getCustomImageFilename(basename); Bitmap *new_bitmap; + if (filename == NULL) + Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename); + if ((new_bitmap = LoadImage(filename)) == NULL) Error(ERR_EXIT, "LoadImage() failed: %s", GetError()); - new_bitmap->source_filename = filename; - return new_bitmap; } +void ReloadCustomImage(Bitmap *bitmap, char *basename) +{ + char *filename = getCustomImageFilename(basename); + Bitmap *new_bitmap; + + if (filename == NULL) /* (should never happen) */ + { + Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", basename); + return; + } + + if (strcmp(filename, bitmap->source_filename) == 0) + { + /* The old and new image are the same (have the same filename and path). + This usually means that this image does not exist in this graphic set + and a fallback to the existing image is done. */ + + return; + } + + if ((new_bitmap = LoadImage(filename)) == NULL) + { + Error(ERR_WARN, "LoadImage() failed: %s", GetError()); + return; + } + + if (bitmap->width != new_bitmap->width || + bitmap->height != new_bitmap->height) + { + Error(ERR_WARN, "ReloadCustomImage: new image '%s' has wrong dimensions", + filename); + FreeBitmap(new_bitmap); + return; + } + + TransferBitmapPointers(new_bitmap, bitmap); + 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 */ @@ -661,17 +926,18 @@ inline void OpenAudio(void) audio.sound_available = FALSE; audio.music_available = FALSE; audio.loops_available = FALSE; - audio.mods_available = FALSE; + audio.sound_enabled = FALSE; + audio.sound_deactivated = FALSE; - audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0; - audio.soundserver_pid = 0; + audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; + audio.mixer_pid = 0; audio.device_name = NULL; - audio.device_fd = 0; + audio.device_fd = -1; - audio.channels = 0; + audio.num_channels = 0; audio.music_channel = 0; - audio.music_nr = 0; + audio.first_sound_channel = 0; #if defined(TARGET_SDL) SDLOpenAudio(); @@ -744,7 +1010,9 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) (int)SDL_GetModState()); #endif - if (with_modifiers && event->keysym.unicode != 0) + if (with_modifiers && + event->keysym.unicode > 0x0000 && + event->keysym.unicode < 0x2000) return event->keysym.unicode; else return event->keysym.sym;