X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fcartoons.c;h=0352e4f85ab17ed5fa8babc68a3c8798d8dce6ab;hb=9f88e49643566b03fbd6e92509bb66fd42bc1daa;hp=0048d4b750ef5ade66587144b2a3431df63b3a87;hpb=30f5fd7b8f2235820dcbe638a18319d802317530;p=rocksndiamonds.git

diff --git a/src/cartoons.c b/src/cartoons.c
index 0048d4b7..0352e4f8 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)
 
@@ -62,7 +64,7 @@ struct GlobalAnimPartControlInfo
   int drawing_stage;
 
   int state;
-  int last_game_status;
+  int last_anim_status;
 };
 
 struct GlobalAnimMainControlInfo
@@ -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 */
@@ -136,7 +139,7 @@ static unsigned int anim_sync_frame_delay_value = GAME_FRAME_DELAY;
 static int game_mode_anim_classes[NUM_GAME_MODES];
 static int anim_class_game_modes[NUM_ANIM_CLASSES];
 
-static int game_status_last = GAME_MODE_DEFAULT;
+static int anim_status_last = GAME_MODE_DEFAULT;
 static int anim_classes_last = ANIM_CLASS_NONE;
 
 
@@ -269,7 +272,7 @@ static void InitToonControls()
     part->step_delay_value = graphic_info[control].step_delay;
 
     part->state = ANIM_STATE_INACTIVE;
-    part->last_game_status = -1;
+    part->last_anim_status = -1;
 
     anim->num_parts++;
     part_nr++;
@@ -355,7 +358,7 @@ void InitGlobalAnimControls()
 	part->step_delay_value = graphic_info[control].step_delay;
 
 	part->state = ANIM_STATE_INACTIVE;
-	part->last_game_status = -1;
+	part->last_anim_status = -1;
 
 	if (p < GLOBAL_ANIM_ID_PART_BASE)
 	{
@@ -391,7 +394,7 @@ void InitGlobalAnimControls()
     anim_class_game_modes[anim_class_game_modes_list[i].class_bit] =
       anim_class_game_modes_list[i].game_mode;
 
-  game_status_last = GAME_MODE_LOADING;
+  anim_status_last = GAME_MODE_LOADING;
   anim_classes_last = ANIM_CLASS_NONE;
 }
 
@@ -402,25 +405,25 @@ void InitGlobalAnimations()
 
 void DrawGlobalAnimExt(int drawing_stage)
 {
-  int anim_classes = game_mode_anim_classes[game_status];
+  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 (game_status != game_status_last)
+  if (global.anim_status != anim_status_last)
   {
     // stop animations for last screen
-    HandleGlobalAnim(ANIM_STOP, game_status_last);
+    HandleGlobalAnim(ANIM_STOP, anim_status_last);
 
     // start animations for current screen
-    HandleGlobalAnim(ANIM_START, game_status);
+    HandleGlobalAnim(ANIM_START, global.anim_status);
 
     // start animations for all screens after loading new artwork set
-    if (game_status_last == GAME_MODE_LOADING)
+    if (anim_status_last == GAME_MODE_LOADING)
       HandleGlobalAnim(ANIM_START, GAME_MODE_DEFAULT);
 
-    game_status_last = game_status;
+    anim_status_last = global.anim_status;
   }
 
   // start or stop global animations by change of animation class
@@ -443,7 +446,7 @@ void DrawGlobalAnimExt(int drawing_stage)
     anim_classes_last = anim_classes;
   }
 
-  if (!setup.toons || game_status == GAME_MODE_LOADING)
+  if (!setup.toons || global.anim_status == GAME_MODE_LOADING)
     return;
 
   if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1)
@@ -553,10 +556,10 @@ boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)
   int viewport_height;
   boolean changed = FALSE;
 
-  if (part->last_game_status == game_status)
+  if (part->last_anim_status == global.anim_status)
     return FALSE;
 
-  part->last_game_status = game_status;
+  part->last_anim_status = global.anim_status;
 
   part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_1;