X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fcartoons.c;h=4797420cfaba5e0284c1b066cf9371cc849298a3;hb=7325072f28452b64057fca0f5fe23eaf945c2794;hp=593066bd5239d16a81e99c26a24b2a3712956bce;hpb=cbab48e3ea7c2821978dccb4f299e81e9c567050;p=rocksndiamonds.git

diff --git a/src/cartoons.c b/src/cartoons.c
index 593066bd..4797420c 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -24,12 +24,14 @@
 #define NUM_GLOBAL_ANIM_PARTS_AND_TOONS	MAX(NUM_GLOBAL_ANIM_PARTS_ALL,	\
 					    NUM_GLOBAL_TOON_PARTS)
 
-#define ANIM_CLASS_BIT_MENU		0
-#define ANIM_CLASS_BIT_TOONS		1
+#define ANIM_CLASS_BIT_SUBMENU		0
+#define ANIM_CLASS_BIT_MENU		1
+#define ANIM_CLASS_BIT_TOONS		2
 
-#define NUM_ANIM_CLASSES		2
+#define NUM_ANIM_CLASSES		3
 
 #define ANIM_CLASS_NONE			0
+#define ANIM_CLASS_SUBMENU		(1 << ANIM_CLASS_BIT_SUBMENU)
 #define ANIM_CLASS_MENU			(1 << ANIM_CLASS_BIT_MENU)
 #define ANIM_CLASS_TOONS		(1 << ANIM_CLASS_BIT_TOONS)
 
@@ -100,14 +102,14 @@ struct GameModeAnimClass
   int class;
 } game_mode_anim_classes_list[] =
 {
-  { GAME_MODE_MAIN,		ANIM_CLASS_TOONS | ANIM_CLASS_MENU	},
-  { GAME_MODE_LEVELS,		ANIM_CLASS_TOONS | ANIM_CLASS_MENU	},
-  { GAME_MODE_LEVELNR,		ANIM_CLASS_TOONS | ANIM_CLASS_MENU	},
-  { GAME_MODE_INFO,		ANIM_CLASS_TOONS | ANIM_CLASS_MENU	},
-  { GAME_MODE_SETUP,		ANIM_CLASS_TOONS | ANIM_CLASS_MENU	},
-  { GAME_MODE_SCORES,		ANIM_CLASS_TOONS			},
-
-  { -1,				-1					}
+  { GAME_MODE_LEVELS, ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
+  { GAME_MODE_LEVELNR,ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
+  { GAME_MODE_INFO,   ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
+  { GAME_MODE_SETUP,  ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
+  { GAME_MODE_MAIN,   ANIM_CLASS_TOONS | ANIM_CLASS_MENU		      },
+  { GAME_MODE_SCORES, ANIM_CLASS_TOONS					      },
+
+  { -1,		      -1						      }
 };
 
 struct AnimClassGameMode
@@ -116,10 +118,11 @@ struct AnimClassGameMode
   int game_mode;
 } anim_class_game_modes_list[] =
 {
-  { ANIM_CLASS_BIT_MENU,	GAME_MODE_PSEUDO_MENU	},
-  { ANIM_CLASS_BIT_TOONS,	GAME_MODE_PSEUDO_TOONS	},
+  { ANIM_CLASS_BIT_SUBMENU,	GAME_MODE_PSEUDO_SUBMENU	},
+  { ANIM_CLASS_BIT_MENU,	GAME_MODE_PSEUDO_MENU		},
+  { ANIM_CLASS_BIT_TOONS,	GAME_MODE_PSEUDO_TOONS		},
 
-  { -1,				-1			}
+  { -1,				-1				}
 };
 
 /* forward declaration for internal use */
@@ -402,14 +405,19 @@ void InitGlobalAnimations()
 
 void DrawGlobalAnimExt(int drawing_stage)
 {
-  int anim_classes = game_mode_anim_classes[global.anim_status_next];
   int mode_nr;
-  int i;
 
-  // start or stop global animations by change of game mode
-  // (special handling of animations for "current screen" and "all screens")
   if (global.anim_status != anim_status_last)
   {
+    boolean before_fading = (global.anim_status == GAME_MODE_PSEUDO_FADING);
+    boolean after_fading  = (anim_status_last   == GAME_MODE_PSEUDO_FADING);
+    int anim_classes_next = game_mode_anim_classes[global.anim_status_next];
+    int i;
+
+    // ---------- part 1 ------------------------------------------------------
+    // start or stop global animations by change of game mode
+    // (special handling of animations for "current screen" and "all screens")
+
     // stop animations for last screen
     HandleGlobalAnim(ANIM_STOP, anim_status_last);
 
@@ -420,27 +428,30 @@ void DrawGlobalAnimExt(int drawing_stage)
     if (anim_status_last == GAME_MODE_LOADING)
       HandleGlobalAnim(ANIM_START, GAME_MODE_DEFAULT);
 
-    anim_status_last = global.anim_status;
-  }
+    // ---------- part 2 ------------------------------------------------------
+    // start or stop global animations by change of animation class
+    // (generic handling of animations for "class of screens")
 
-  // start or stop global animations by change of animation class
-  // (generic handling of animations for "class of screens")
-  if (anim_classes != anim_classes_last)
-  {
     for (i = 0; i < NUM_ANIM_CLASSES; i++)
     {
       int anim_class_check = (1 << i);
       int anim_class_game_mode = anim_class_game_modes[i];
       int anim_class_last = anim_classes_last & anim_class_check;
-      int anim_class      = anim_classes      & anim_class_check;
+      int anim_class_next = anim_classes_next & anim_class_check;
 
-      if (anim_class_last && !anim_class)
+      // stop animations for changed screen class before fading to new screen
+      if (before_fading && anim_class_last && !anim_class_next)
 	HandleGlobalAnim(ANIM_STOP, anim_class_game_mode);
-      else if (!anim_class_last && anim_class)
+
+      // start animations for changed screen class after fading to new screen
+      if (after_fading && !anim_class_last && anim_class_next)
 	HandleGlobalAnim(ANIM_START, anim_class_game_mode);
     }
 
-    anim_classes_last = anim_classes;
+    if (after_fading)
+      anim_classes_last = anim_classes_next;
+
+    anim_status_last = global.anim_status;
   }
 
   if (!setup.toons || global.anim_status == GAME_MODE_LOADING)