X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=6e7fe94823bd6b751396b4600958eeaba964cc1f;hb=6b9be0de63f8e031e8400b829fd2dc9b125bb0b4;hp=f2f074a796a8b9133d9d8df9efb4a116be6f4830;hpb=d14ff3d04c44d90b4dc151fd7774946e20da0152;p=rocksndiamonds.git diff --git a/src/game_em/init.c b/src/game_em/init.c index f2f074a7..6e7fe948 100644 --- a/src/game_em/init.c +++ b/src/game_em/init.c @@ -3,19 +3,15 @@ * open X11 display and sound */ +#include "main_em.h" + + #include #if !defined(TARGET_SDL) #include #endif -#include "main_em.h" - -#include "global.h" -#include "display.h" -#include "sample.h" -#include "level.h" - Bitmap *objBitmap; Bitmap *sprBitmap; @@ -44,6 +40,7 @@ int play_element[SAMPLE_MAX]; static boolean use_native_em_sound = 0; struct GlobalInfo_EM global_em_info; +struct GameInfo_EM game_em; #if defined(AUDIO_UNIX_NATIVE) static int sound_pid = -1; @@ -369,14 +366,14 @@ void sound_play(void) #endif - memset(play, 0, sizeof(play)); + clear_mem(play, sizeof(play)); } -unsigned int InitEngineRND_EM(long seed) +unsigned int InitEngineRandom_EM(long seed) { if (seed == NEW_RANDOMIZE) { - int simple_rnd = SimpleRND(1000); + int simple_rnd = GetSimpleRandom(1000); int i; for (i = 0; i < simple_rnd || RandomEM == NEW_RANDOMIZE; i++)