added special screen mode group '.SUBMENU' for global animations

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 593066bd5239d16a81e99c26a24b2a3712956bce..0352e4f85ab17ed5fa8babc68a3c8798d8dce6ab 100644 (file)
--- 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 */