X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=cc7dc2aa33fb4111ff5f737ca76a4a731437960c;hb=c9433eab5c4317ed4f89164b386a7d33562e29be;hp=bd9fc229206806112c19f051eb9e02d0615018bc;hpb=868a1c69992bb641676a9e6eee5e7308cd02ecde;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index bd9fc229..cc7dc2aa 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 * @@ -22,6 +22,8 @@ #include "system.h" #include "sound.h" +#include "setup.h" +#include "joystick.h" #include "misc.h" @@ -34,26 +36,30 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +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; -Visual *visual = NULL; -int screen = 0; -Colormap cmap = None; +Display *display = NULL; +Visual *visual = NULL; +int screen = 0; +Colormap cmap = None; -DrawWindow *window = NULL; -DrawBuffer *backbuffer = NULL; -DrawBuffer *drawto = NULL; +DrawWindow *window = NULL; +DrawBuffer *backbuffer = NULL; +DrawBuffer *drawto = NULL; -int button_status = MB_NOT_PRESSED; -boolean motion_status = FALSE; +int button_status = MB_NOT_PRESSED; +boolean motion_status = FALSE; -int redraw_mask = REDRAW_NONE; -int redraw_tiles = 0; +int redraw_mask = REDRAW_NONE; +int redraw_tiles = 0; -int FrameCounter = 0; +int FrameCounter = 0; /* ========================================================================= */ @@ -106,16 +112,11 @@ void ClosePlatformDependantStuff(void) 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 *gfx_dir = getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY); - char *x11_icon_filename = getPath2(gfx_dir, x11_icon_basename); - char *x11_iconmask_filename = getPath2(gfx_dir, x11_iconmask_basename); - char *msdos_pointer_filename = getPath2(gfx_dir, msdos_pointer_basename); - - free(gfx_dir); - #if defined(PLATFORM_UNIX) program.userdata_directory = unix_userdata_directory; #else @@ -128,6 +129,13 @@ void InitProgramInfo(char *unix_userdata_directory, char *program_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, @@ -142,6 +150,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.real_sy = real_sy; gfx.full_sxsize = full_sxsize; gfx.full_sysize = full_sysize; + + SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ } void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize) @@ -167,6 +177,11 @@ void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) gfx.scrollbuffer_height = scrollbuffer_height; } +void SetDrawDeactivationMask(int draw_deactivation_mask) +{ + gfx.draw_deactivation_mask = draw_deactivation_mask; +} + /* ========================================================================= */ /* video functions */ @@ -193,6 +208,7 @@ inline void CloseVideoDisplay(void) #if defined(TARGET_SDL) SDL_QuitSubSystem(SDL_INIT_VIDEO); #else + if (display) XCloseDisplay(display); #endif @@ -265,7 +281,7 @@ inline Bitmap *CreateBitmap(int width, int height, int depth) return new_bitmap; } -inline void FreeBitmap(Bitmap *bitmap) +inline static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -275,15 +291,49 @@ 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 correspondig 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); } @@ -300,11 +350,36 @@ inline void CloseWindow(DrawWindow *window) #endif } +inline boolean DrawingDeactivated(int x, int y, int width, int height) +{ + if (gfx.draw_deactivation_mask != REDRAW_NONE) + { + 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; + } + } + + return FALSE; +} + inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, int src_x, int src_y, int width, int height, int dst_x, int dst_y) { + if (DrawingDeactivated(dst_x, dst_y, width, height)) + return; + #ifdef TARGET_SDL SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_OPAQUE); @@ -316,6 +391,9 @@ inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) { + if (DrawingDeactivated(x, y, width, height)) + return; + #ifdef TARGET_SDL SDLFillRectangle(bitmap, x, y, width, height, 0x000000); #else @@ -362,6 +440,9 @@ inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, int width, int height, int dst_x, int dst_y) { + if (DrawingDeactivated(dst_x, dst_y, width, height)) + return; + #ifdef TARGET_SDL SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_MASKED); @@ -438,6 +519,26 @@ inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, #endif } +inline Pixel GetPixel(Bitmap *bitmap, int x, int y) +{ +#if defined(TARGET_SDL) + return SDLGetPixel(bitmap, x, y); +#elif defined(TARGET_ALLEGRO) + return AllegroGetPixel(bitmap->drawable, x, y); +#else + unsigned long pixel_value; + XImage *pixel_image; + + pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1, + AllPlanes, ZPixmap); + pixel_value = XGetPixel(pixel_image, 0, 0); + + XDestroyImage(pixel_image); + + return pixel_value; +#endif +} + inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, unsigned int color_g, unsigned int color_b) { @@ -558,11 +659,9 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) return fullscreen; } -Bitmap *LoadImage(char *basename) +Bitmap *LoadImage(char *filename) { Bitmap *new_bitmap; - char *filename = getPath3(options.ro_base_directory, GRAPHICS_DIRECTORY, - basename); #if defined(TARGET_SDL) new_bitmap = SDLLoadImage(filename); @@ -570,11 +669,64 @@ Bitmap *LoadImage(char *basename) new_bitmap = X11LoadImage(filename); #endif - free(filename); + if (new_bitmap) + new_bitmap->source_filename = getStringCopy(filename); + + return new_bitmap; +} + +Bitmap *LoadCustomImage(char *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()); 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 has wrong dimensions"); + FreeBitmap(new_bitmap); + return; + } + + TransferBitmapPointers(new_bitmap, bitmap); + free(new_bitmap); +} + /* ========================================================================= */ /* audio functions */ @@ -586,24 +738,25 @@ 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 = -1; 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(); -#elif defined(PLATFORM_MSDOS) - MSDOSOpenAudio(); #elif defined(PLATFORM_UNIX) UnixOpenAudio(); +#elif defined(PLATFORM_MSDOS) + MSDOSOpenAudio(); #endif } @@ -611,10 +764,10 @@ inline void CloseAudio(void) { #if defined(TARGET_SDL) SDLCloseAudio(); -#elif defined(PLATFORM_MSDOS) - MSDOSCloseAudio(); #elif defined(PLATFORM_UNIX) UnixCloseAudio(); +#elif defined(PLATFORM_MSDOS) + MSDOSCloseAudio(); #endif audio.sound_enabled = FALSE; @@ -669,7 +822,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; @@ -704,9 +859,39 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) } -inline void dummy(void) +/* ========================================================================= */ +/* joystick functions */ +/* ========================================================================= */ + +inline void InitJoysticks() { -#ifdef TARGET_SDL -#else + int i; + +#ifdef NO_JOYSTICK + return; /* joysticks generally deactivated by compile-time directive */ +#endif + + /* always start with reliable default values */ + joystick.status = JOYSTICK_NOT_AVAILABLE; + for (i=0; i