X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=42117321e902bf5a0cf88236b7dd1e02fce73cb5;hb=2d235297197dd0c325184f7fc401d9c5c41c2616;hp=5f6d2ed3a1e086bfcc49b0d99b185f1c6e1cc3c0;hpb=f2b486caeabc0548dfa744c1569496c087b7420f;p=rocksndiamonds.git diff --git a/src/game_em/init.c b/src/game_em/init.c index 5f6d2ed3..42117321 100644 --- a/src/game_em/init.c +++ b/src/game_em/init.c @@ -4,9 +4,12 @@ */ #include + +#if !defined(TARGET_SDL) #include +#endif -#include "game_em.h" +#include "main_em.h" #include "global.h" #include "display.h" @@ -38,14 +41,16 @@ int play_x[SAMPLE_MAX]; int play_y[SAMPLE_MAX]; int play_element[SAMPLE_MAX]; +static boolean use_native_em_sound = 0; + +struct GlobalInfo_EM global_em_info; + #if defined(AUDIO_UNIX_NATIVE) static int sound_pid = -1; int sound_pipe[2] = { -1, -1 }; /* for communication */ short *sound_data[SAMPLE_MAX]; /* pointer to sound data */ long sound_length[SAMPLE_MAX]; /* length of sound data */ -static boolean use_native_em_sound = 0; - static const char *sound_names[SAMPLE_MAX] = { "00.blank.au", @@ -148,6 +153,9 @@ int open_all(void) screenBitmap = CreateBitmap(MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY, DEFAULT_DEPTH); + + global_em_info.screenbuffer = screenBitmap; + #endif #if 0 @@ -238,7 +246,9 @@ void em_open_all() { /* pre-calculate some data */ tab_generate(); +#if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD) ulaw_generate(); +#endif progname = "emerald mine";