X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=3d00d8e890d4ec419a0907220c76c3adaab1f229;hb=11db3a75c0ab5b9e8c98b4cdbb17080f9dc3d1a5;hp=341da455c5f8f7487613279510d42362bf7e30e9;hpb=d2098db6b7b0cee3b43e341c012beec5bc6ef6bd;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 341da455..3d00d8e8 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2000 Artsoft Entertainment * +* (c) 1994-2001 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -87,6 +87,7 @@ void InitPlatformDependantStuff(void) #endif #if !defined(PLATFORM_UNIX) + program.userdata_directory = "userdata"; initErrorFile(); #endif @@ -108,12 +109,12 @@ void InitProgramInfo(char *unix_userdata_directory, char *program_title, char *x11_icon_basename, char *x11_iconmask_basename, char *msdos_pointer_basename) { - 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); + 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; @@ -178,7 +179,7 @@ inline static int GetRealDepth(int depth) inline void InitVideoDisplay(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLInitVideoDisplay(); #else X11InitVideoDisplay(); @@ -187,7 +188,11 @@ inline void InitVideoDisplay(void) inline void CloseVideoDisplay(void) { -#if defined(TARGET_X11) + KeyboardAutoRepeatOn(); + +#if defined(TARGET_SDL) + SDL_QuitSubSystem(SDL_INIT_VIDEO); +#else if (display) XCloseDisplay(display); #endif @@ -370,7 +375,7 @@ inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, int to_x, int to_y) { #ifdef TARGET_SDL - SDLDrawSimpleLine(bitmap->surface, from_x, from_y, to_x, to_y, 0xffffff); + SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff); #else XSetForeground(display, bitmap->gc, WhitePixel(display, screen)); XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y); @@ -398,8 +403,8 @@ inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, continue; #if defined(TARGET_SDL) - sge_Line(bitmap->surface, - from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel); + SDLDrawLine(bitmap, + from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel); #elif defined(TARGET_ALLEGRO) AllegroDrawLine(bitmap->drawable, from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel); @@ -433,6 +438,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) { @@ -440,6 +465,8 @@ inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, #if defined(TARGET_SDL) pixel = SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); +#elif defined(TARGET_ALLEGRO) + pixel = AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8); #elif defined(TARGET_X11_NATIVE) XColor xcolor; @@ -554,10 +581,7 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) Bitmap *LoadImage(char *basename) { Bitmap *new_bitmap; - char filename[256]; - - sprintf(filename, "%s/%s/%s", - options.ro_base_directory, GRAPHICS_DIRECTORY, basename); + char *filename = getPath2(options.graphics_directory, basename); #if defined(TARGET_SDL) new_bitmap = SDLLoadImage(filename); @@ -565,6 +589,8 @@ Bitmap *LoadImage(char *basename) new_bitmap = X11LoadImage(filename); #endif + free(filename); + return new_bitmap; } @@ -573,50 +599,44 @@ Bitmap *LoadImage(char *basename) /* audio functions */ /* ========================================================================= */ -inline boolean OpenAudio(struct AudioSystemInfo *audio) +inline void OpenAudio(void) { - audio->sound_available = FALSE; - audio->loops_available = FALSE; - audio->sound_enabled = FALSE; - audio->soundserver_pipe[0] = audio->soundserver_pipe[1] = 0; - audio->soundserver_pid = 0; - audio->device_name = NULL; - audio->device_fd = 0; + /* always start with reliable default values */ + audio.sound_available = FALSE; + audio.music_available = FALSE; + audio.loops_available = FALSE; + audio.mods_available = FALSE; + audio.sound_enabled = FALSE; + + audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0; + audio.soundserver_pid = 0; + audio.device_name = NULL; + audio.device_fd = 0; + + audio.channels = 0; + audio.music_channel = 0; + audio.music_nr = 0; #if defined(TARGET_SDL) - if (SDLOpenAudio()) - { - audio->sound_available = TRUE; - audio->loops_available = TRUE; - audio->sound_enabled = TRUE; - } + SDLOpenAudio(); #elif defined(PLATFORM_MSDOS) - if (MSDOSOpenAudio()) - { - audio->sound_available = TRUE; - audio->loops_available = TRUE; - audio->sound_enabled = TRUE; - } + MSDOSOpenAudio(); #elif defined(PLATFORM_UNIX) - UnixOpenAudio(audio); + UnixOpenAudio(); #endif - - return audio->sound_available; } -inline void CloseAudio(struct AudioSystemInfo *audio) +inline void CloseAudio(void) { #if defined(TARGET_SDL) SDLCloseAudio(); #elif defined(PLATFORM_MSDOS) MSDOSCloseAudio(); #elif defined(PLATFORM_UNIX) - UnixCloseAudio(audio); + UnixCloseAudio(); #endif - audio->sound_available = FALSE; - audio->loops_available = FALSE; - audio->sound_enabled = FALSE; + audio.sound_enabled = FALSE; } inline void SetAudioMode(boolean enabled) @@ -652,7 +672,7 @@ inline boolean PendingEvent(void) inline void NextEvent(Event *event) { #ifdef TARGET_SDL - SDL_WaitEvent(event); + SDLNextEvent(event); #else XNextEvent(display, event); #endif