X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=39f7e6469280c5a8da51dbc1bf13a0d0aaf92aaf;hb=ebd52bd119746407c06131563cc9b5c1b7c3d01d;hp=2f0278ef19360c83630208261d9cc28a3b107c30;hpb=4542dedd9ed31f1eaf2639a903c83d6f47909d93;p=rocksndiamonds.git diff --git a/src/anim.c b/src/anim.c index 2f0278ef..39f7e646 100644 --- a/src/anim.c +++ b/src/anim.c @@ -961,7 +961,7 @@ static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part viewport_width = part->graphic_info.width; viewport_height = part->graphic_info.height; - part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_2; + part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_3; // do not use global animation mouse pointer when reloading artwork if (global.anim_status != GAME_MODE_LOADING) @@ -1082,6 +1082,13 @@ static void StopGlobalAnimMusic(struct GlobalAnimPartControlInfo *part) if (music == MUS_UNDEFINED) return; + char *anim_music = getMusicInfoEntryFilename(music); + char *curr_music = getCurrentlyPlayingMusicFilename(); + + // do not stop music if global anim music differs from current music + if (!strEqual(curr_music, anim_music)) + return; + StopMusic(); #if 0