X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fcartoons.c;h=c2072a2067c51cc279d018e135b2df5ac7c94524;hb=da028195db34242cd7a82d82de768109963509cb;hp=9b80de87e3ed2685a6da1247c970b6cb37f3c856;hpb=cea1ea492e56f8816aa76b3d59ae44c4f3b73339;p=rocksndiamonds.git

diff --git a/src/cartoons.c b/src/cartoons.c
index 9b80de87..c2072a20 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -24,17 +24,27 @@
 #define NUM_GLOBAL_ANIM_PARTS_AND_TOONS	MAX(NUM_GLOBAL_ANIM_PARTS_ALL,	\
 					    NUM_GLOBAL_TOON_PARTS)
 
-#define ANIM_CLASS_BIT_SUBMENU		0
-#define ANIM_CLASS_BIT_MENU		1
-#define ANIM_CLASS_BIT_TOONS		2
+#define ANIM_CLASS_BIT_TITLE_INITIAL	0
+#define ANIM_CLASS_BIT_TITLE		1
+#define ANIM_CLASS_BIT_SUBMENU		2
+#define ANIM_CLASS_BIT_MENU		3
+#define ANIM_CLASS_BIT_TOONS		4
 
-#define NUM_ANIM_CLASSES		3
+#define NUM_ANIM_CLASSES		5
 
 #define ANIM_CLASS_NONE			0
+#define ANIM_CLASS_TITLE_INITIAL	(1 << ANIM_CLASS_BIT_TITLE_INITIAL)
+#define ANIM_CLASS_TITLE		(1 << ANIM_CLASS_BIT_TITLE)
 #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)
 
+#define ANIM_CLASS_TOONS_MENU		(ANIM_CLASS_TOONS |	\
+					 ANIM_CLASS_MENU)
+
+#define ANIM_CLASS_TOONS_MENU_SUBMENU	(ANIM_CLASS_TOONS |	\
+					 ANIM_CLASS_MENU  |	\
+					 ANIM_CLASS_SUBMENU)
 
 struct GlobalAnimPartControlInfo
 {
@@ -104,14 +114,24 @@ struct GameModeAnimClass
   int class;
 } game_mode_anim_classes_list[] =
 {
-  { 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						      }
+  { GAME_MODE_TITLE_INITIAL_1,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_2,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_3,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_4,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_5,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_1,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_2,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_3,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_4,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_5,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_LEVELS, 			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_LEVELNR,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_INFO,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_SETUP,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_MAIN,			ANIM_CLASS_TOONS_MENU		},
+  { GAME_MODE_SCORES,			ANIM_CLASS_TOONS		},
+
+  { -1,					-1				}
 };
 
 struct AnimClassGameMode
@@ -120,11 +140,13 @@ struct AnimClassGameMode
   int game_mode;
 } anim_class_game_modes_list[] =
 {
-  { ANIM_CLASS_BIT_SUBMENU,	GAME_MODE_PSEUDO_SUBMENU	},
-  { ANIM_CLASS_BIT_MENU,	GAME_MODE_PSEUDO_MENU		},
-  { ANIM_CLASS_BIT_TOONS,	GAME_MODE_PSEUDO_TOONS		},
+  { ANIM_CLASS_BIT_TITLE_INITIAL,	GAME_MODE_TITLE_INITIAL		},
+  { ANIM_CLASS_BIT_TITLE,		GAME_MODE_TITLE			},
+  { 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 */