X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=f29b589671c2a91da5b26d6d39327e40ef54875a;hb=f01bf775110c477482734c49edcc695c26d04800;hp=54759eefbe5a12ca785365e6fca8817e1a079f58;hpb=ceb7ded99fc9cc9519adeea07808a344678c196e;p=rocksndiamonds.git diff --git a/src/game_em/init.c b/src/game_em/init.c index 54759eef..f29b5896 100644 --- a/src/game_em/init.c +++ b/src/game_em/init.c @@ -44,6 +44,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; @@ -299,18 +300,18 @@ void em_close_all(void) /* ---------------------------------------------------------------------- */ -extern unsigned int screen_x; -extern unsigned int screen_y; +extern int screen_x; +extern int screen_y; void play_element_sound(int x, int y, int sample, int element) { #if 0 - unsigned int left = screen_x / TILEX; - unsigned int top = screen_y / TILEY; + int left = screen_x / TILEX; + int top = screen_y / TILEY; if ((x == -1 && y == -1) || /* play sound in the middle of the screen */ - ((unsigned int)(y - top) <= SCR_FIELDY && - (unsigned int)(x - left) <= SCR_FIELDX)) + ((int)(y - top) <= SCR_FIELDY && + (int)(x - left) <= SCR_FIELDX)) #endif { #if 1