added special global animation mode 'NO_TITLE' for all but title screens
authorHolger Schemel <info@artsoft.org>
Sat, 27 Oct 2018 18:29:40 +0000 (20:29 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 27 Oct 2018 18:29:48 +0000 (20:29 +0200)
src/anim.c
src/main.c
src/main.h

index 1215f1ca7f1f66d5b9def641e54386a789831e91..2234ebe48d8e55697a373947bb96990022733d0f 100644 (file)
@@ -35,8 +35,9 @@
 #define ANIM_CLASS_BIT_SUBMENU         4
 #define ANIM_CLASS_BIT_MENU            5
 #define ANIM_CLASS_BIT_TOONS           6
+#define ANIM_CLASS_BIT_NO_TITLE                7
 
-#define NUM_ANIM_CLASSES               7
+#define NUM_ANIM_CLASSES               8
 
 #define ANIM_CLASS_NONE                        0
 #define ANIM_CLASS_TITLE_INITIAL       (1 << ANIM_CLASS_BIT_TITLE_INITIAL)
 #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_NO_TITLE            (1 << ANIM_CLASS_BIT_NO_TITLE)
 
-#define ANIM_CLASS_TOONS_SCORES                (ANIM_CLASS_TOONS |     \
-                                        ANIM_CLASS_SCORES)
+#define ANIM_CLASS_TOONS_SCORES                (ANIM_CLASS_TOONS       |       \
+                                        ANIM_CLASS_SCORES      |       \
+                                        ANIM_CLASS_NO_TITLE)
 
-#define ANIM_CLASS_TOONS_MENU_MAIN     (ANIM_CLASS_TOONS |     \
-                                        ANIM_CLASS_MENU  |     \
-                                        ANIM_CLASS_MAIN)
+#define ANIM_CLASS_TOONS_MENU_MAIN     (ANIM_CLASS_TOONS       |       \
+                                        ANIM_CLASS_MENU        |       \
+                                        ANIM_CLASS_MAIN        |       \
+                                        ANIM_CLASS_NO_TITLE)
 
-#define ANIM_CLASS_TOONS_MENU_SUBMENU  (ANIM_CLASS_TOONS |     \
-                                        ANIM_CLASS_MENU  |     \
-                                        ANIM_CLASS_SUBMENU)
+#define ANIM_CLASS_TOONS_MENU_SUBMENU  (ANIM_CLASS_TOONS       |       \
+                                        ANIM_CLASS_MENU        |       \
+                                        ANIM_CLASS_SUBMENU     |       \
+                                        ANIM_CLASS_NO_TITLE)
 
 // values for global animation states
 #define ANIM_STATE_INACTIVE            0
@@ -174,6 +179,8 @@ struct GameModeAnimClass
   { GAME_MODE_PSEUDO_TYPENAME,         ANIM_CLASS_TOONS_MENU_MAIN      },
   { GAME_MODE_PSEUDO_SCORESOLD,                ANIM_CLASS_TOONS_SCORES         },
   { GAME_MODE_PSEUDO_SCORESNEW,                ANIM_CLASS_TOONS_SCORES         },
+  { GAME_MODE_EDITOR,                  ANIM_CLASS_NO_TITLE             },
+  { GAME_MODE_PLAYING,                 ANIM_CLASS_NO_TITLE             },
 
   { -1,                                        -1                              }
 };
@@ -191,6 +198,7 @@ struct AnimClassGameMode
   { 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_NO_TITLE,           GAME_MODE_PSEUDO_NO_TITLE       },
 
   { -1,                                        -1                              }
 };
index f35974bce5fd4c18a40ff7e1bd615522a0f9c83f..c6721602438e4d0dc65296a6465d30e00fb4623b 100644 (file)
@@ -7428,6 +7428,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".TOONS",                  GFX_SPECIAL_ARG_TOONS,                  },
   { ".SCORESOLD",              GFX_SPECIAL_ARG_SCORESOLD,              },
   { ".SCORESNEW",              GFX_SPECIAL_ARG_SCORESNEW,              },
+  { ".NO_TITLE",               GFX_SPECIAL_ARG_NO_TITLE,               },
   { ".FADING",                 GFX_SPECIAL_ARG_FADING,                 },
   { ".QUIT",                   GFX_SPECIAL_ARG_QUIT,                   },
 
index d17064c608f7fe8a106f78fd6c1ce347a5c43a49..8cf8642a02b72c87c4fb553ef69d386fe326da5c 100644 (file)
 #define GFX_SPECIAL_ARG_TOONS          31
 #define GFX_SPECIAL_ARG_SCORESOLD      32
 #define GFX_SPECIAL_ARG_SCORESNEW      33
-#define GFX_SPECIAL_ARG_FADING         34
-#define GFX_SPECIAL_ARG_QUIT           35
+#define GFX_SPECIAL_ARG_NO_TITLE       34
+#define GFX_SPECIAL_ARG_FADING         35
+#define GFX_SPECIAL_ARG_QUIT           36
 
-#define NUM_SPECIAL_GFX_ARGS           36
+#define NUM_SPECIAL_GFX_ARGS           37
 
 // these additional definitions are currently only used for draw offsets
 #define GFX_SPECIAL_ARG_INFO_MAIN      0
 #define GAME_MODE_PSEUDO_TOONS         31
 #define GAME_MODE_PSEUDO_SCORESOLD     32
 #define GAME_MODE_PSEUDO_SCORESNEW     33
-#define GAME_MODE_PSEUDO_FADING                34
-#define GAME_MODE_QUIT                 35
+#define GAME_MODE_PSEUDO_NO_TITLE      34
+#define GAME_MODE_PSEUDO_FADING                35
+#define GAME_MODE_QUIT                 36
 
-#define NUM_GAME_MODES                 36
+#define NUM_GAME_MODES                 37
 
 // special definitions currently only used for custom artwork configuration
 #define MUSIC_PREFIX_BACKGROUND                0