X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmsdos.c;h=ec19ef6389c7d639c99f9106ef17826ff53de950;hb=de8b3ae622eae10f1caf96872fb1790f7bd9644b;hp=61e1eaf2a3efbdee6b205d0ad557734aa56a4089;hpb=430aa8b71d2031eabc6341d4812363023105586e;p=rocksndiamonds.git diff --git a/src/libgame/msdos.c b/src/libgame/msdos.c index 61e1eaf2..ec19ef63 100644 --- a/src/libgame/msdos.c +++ b/src/libgame/msdos.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 * @@ -54,12 +54,6 @@ static int global_colormap_entries_used = 0; boolean wait_for_vsync; -/* -extern int playing_sounds; -extern struct SoundControl playlist[NUM_MIXER_CHANNELS]; -extern struct SoundControl emptySoundControl; -*/ - static BITMAP *Read_PCX_to_AllegroBitmap(char *); static void allegro_init_drivers() @@ -303,7 +297,7 @@ Display *XOpenDisplay(char *display_name) Screen *screen; Display *display; BITMAP *mouse_bitmap = NULL; - char *mouse_filename =getCustomImageFilename(program.msdos_pointer_filename); + char *mouse_filename = getCustomImageFilename(program.msdos_cursor_filename); if ((mouse_bitmap = Read_PCX_to_AllegroBitmap(mouse_filename)) == NULL) return NULL; @@ -923,6 +917,14 @@ Pixel AllegroGetPixel(Drawable d, int x, int y) return getpixel((BITMAP *)d, x, y); } +void AllegroZoomBitmap(Drawable src, Drawable dst, + int src_width, int src_height, + int dst_width, int dst_height) +{ + stretch_blit((BITMAP *)src, (BITMAP *)dst, + 0, 0, src_width, src_height, 0, 0, dst_width, dst_height); +} + void MSDOSOpenAudio(void) { if (allegro_init_audio()) @@ -936,7 +938,7 @@ void MSDOSOpenAudio(void) audio.music_channel = MUSIC_CHANNEL; audio.first_sound_channel = FIRST_SOUND_CHANNEL; - InitPlaylist(); + Mixer_InitChannels(); } }