X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=4bd3b8d9196f83518af4bf5d4797a8c1b54c741d;hb=ad93f89279233a6adfa0dc0ebe3570c4c614cedb;hp=c14445814bdcce85ab0ab3fd4e7b2f1090cf71e9;hpb=c845df106ed2c6af8923eb3d9dc1eb7af621861e;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index c1444581..4bd3b8d9 100644 --- a/src/tools.c +++ b/src/tools.c @@ -982,7 +982,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) redraw_mask &= ~fade_mask; - ClearEventQueue(); + ClearAutoRepeatKeyEvents(); } static void SetScreenStates_BeforeFadingIn() @@ -2803,7 +2803,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame); } - ClearEventQueue(); + ClearAutoRepeatKeyEvents(); } void ShowEnvelope(int envelope_nr) @@ -3088,7 +3088,7 @@ void AnimateEnvelopeRequest(int anim_mode, int action) SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame); } - ClearEventQueue(); + ClearAutoRepeatKeyEvents(); } void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) @@ -5429,7 +5429,7 @@ unsigned int MoveDoor(unsigned int door_state) DrawMaskedBorder(REDRAW_DOOR_1); DrawMaskedBorder(REDRAW_DOOR_2); - ClearEventQueue(); + ClearAutoRepeatKeyEvents(); return (door1 | door2); } @@ -8115,7 +8115,7 @@ int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) boolean getTeamMode_EM() { - return game.team_mode; + return game.team_mode || network_playing; } int getGameFrameDelay_EM(int native_em_game_frame_delay) @@ -9215,7 +9215,10 @@ void PlayMenuMusicExt(int music) if (!setup.sound_music) return; - PlayMusic(music); + if (IS_LOOP_MUSIC(music)) + PlayMusicLoop(music); + else + PlayMusic(music); } void PlayMenuMusic() @@ -9391,6 +9394,13 @@ void ResetFontStatus() SetFontStatus(-1); } +void SetLevelSetInfo(char *identifier, int level_nr) +{ + setString(&levelset.identifier, identifier); + + levelset.level_nr = level_nr; +} + boolean CheckIfPlayfieldViewportHasChanged() { // if game status has not changed, playfield viewport has not changed either