changed screen specific global animations to stop when fading screens

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 2fa69f1151f8656702b3e6993645b243a81b095a..4a5243602014051440e8ae14fca474bce98b5c9e 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -643,10 +643,14 @@ void FadeIn(int fade_mask)
   FADE_SY = REAL_SY;
   FADE_SXSIZE = FULL_SXSIZE;
   FADE_SYSIZE = FULL_SYSIZE;
+
+  global.anim_status = global.anim_status_next;
 }
 
 void FadeOut(int fade_mask)
 {
+  global.anim_status = GAME_MODE_PSEUDO_FADING;
+
 #if 0
   DrawMaskedBorder(REDRAW_ALL);
 #endif
@@ -8181,6 +8185,8 @@ void JoinRectangles(int *x, int *y, int *width, int *height,
 void SetGameStatus(int game_status_new)
 {
   game_status = game_status_new;
+
+  global.anim_status_next = game_status;
 }
 
 void ChangeViewportPropertiesIfNeeded()