projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030801-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
msdos.c
diff --git
a/src/libgame/msdos.c
b/src/libgame/msdos.c
index ea75479de66edec7947d86a2a44315a4315e15e3..ec19ef6389c7d639c99f9106ef17826ff53de950 100644
(file)
--- a/
src/libgame/msdos.c
+++ b/
src/libgame/msdos.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
1
Artsoft Entertainment *
+* (c) 1994-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-54,12
+54,6
@@
static int global_colormap_entries_used = 0;
boolean wait_for_vsync;
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()
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;
Screen *screen;
Display *display;
BITMAP *mouse_bitmap = NULL;
- char *mouse_filename =
getCustomImageFilename(program.msdos_pointe
r_filename);
+ char *mouse_filename =
getCustomImageFilename(program.msdos_curso
r_filename);
if ((mouse_bitmap = Read_PCX_to_AllegroBitmap(mouse_filename)) == NULL)
return NULL;
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);
}
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())
void MSDOSOpenAudio(void)
{
if (allegro_init_audio())
@@
-931,9
+933,13
@@
void MSDOSOpenAudio(void)
audio.music_available = TRUE;
audio.loops_available = TRUE;
audio.sound_enabled = TRUE;
audio.music_available = TRUE;
audio.loops_available = TRUE;
audio.sound_enabled = TRUE;
- }
- InitPlaylist();
+ audio.num_channels = NUM_MIXER_CHANNELS;
+ audio.music_channel = MUSIC_CHANNEL;
+ audio.first_sound_channel = FIRST_SOUND_CHANNEL;
+
+ Mixer_InitChannels();
+ }
}
void MSDOSCloseAudio(void)
}
void MSDOSCloseAudio(void)