From: Holger Schemel Date: Sat, 27 Oct 2018 18:29:40 +0000 (+0200) Subject: added special global animation mode 'NO_TITLE' for all but title screens X-Git-Tag: 4.1.2.0~123 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f6436160a89cc2edb8e9f622f390108690359e88;p=rocksndiamonds.git added special global animation mode 'NO_TITLE' for all but title screens --- diff --git a/src/anim.c b/src/anim.c index 1215f1ca..2234ebe4 100644 --- a/src/anim.c +++ b/src/anim.c @@ -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) @@ -46,17 +47,21 @@ #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 } }; diff --git a/src/main.c b/src/main.c index f35974bc..c6721602 100644 --- a/src/main.c +++ b/src/main.c @@ -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, }, diff --git a/src/main.h b/src/main.h index d17064c6..8cf8642a 100644 --- a/src/main.h +++ b/src/main.h @@ -2278,10 +2278,11 @@ #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 @@ -2504,10 +2505,11 @@ #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