projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed screen specific global animations to stop when fading screens
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 05c28b8e69d35675e26fa997a6c1490281ff470f..36500844c80d92a882380af57f588436cfd49f67 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-1804,9
+1804,10
@@
#define GFX_SPECIAL_ARG_TYPENAME 17
#define GFX_SPECIAL_ARG_MENU 18
#define GFX_SPECIAL_ARG_TOONS 19
#define GFX_SPECIAL_ARG_TYPENAME 17
#define GFX_SPECIAL_ARG_MENU 18
#define GFX_SPECIAL_ARG_TOONS 19
-#define GFX_SPECIAL_ARG_QUIT 20
+#define GFX_SPECIAL_ARG_FADING 20
+#define GFX_SPECIAL_ARG_QUIT 21
-#define NUM_SPECIAL_GFX_ARGS 2
1
+#define NUM_SPECIAL_GFX_ARGS 2
2
/* these additional definitions are currently only used for draw offsets */
#define GFX_SPECIAL_ARG_INFO_MAIN 0
/* these additional definitions are currently only used for draw offsets */
#define GFX_SPECIAL_ARG_INFO_MAIN 0
@@
-2006,9
+2007,10
@@
#define GAME_MODE_PSEUDO_TYPENAME 17
#define GAME_MODE_PSEUDO_MENU 18
#define GAME_MODE_PSEUDO_TOONS 19
#define GAME_MODE_PSEUDO_TYPENAME 17
#define GAME_MODE_PSEUDO_MENU 18
#define GAME_MODE_PSEUDO_TOONS 19
-#define GAME_MODE_QUIT 20
+#define GAME_MODE_PSEUDO_FADING 20
+#define GAME_MODE_QUIT 21
-#define NUM_GAME_MODES 2
1
+#define NUM_GAME_MODES 2
2
/* special definitions currently only used for custom artwork configuration */
#define MUSIC_PREFIX_BACKGROUND 0
/* special definitions currently only used for custom artwork configuration */
#define MUSIC_PREFIX_BACKGROUND 0
@@
-2584,6
+2586,10
@@
struct GlobalInfo
/* global values for fading screens and masking borders */
int border_status;
/* global values for fading screens and masking borders */
int border_status;
+ /* values for global animations */
+ int anim_status;
+ int anim_status_next;
+
boolean use_envelope_request;
};
boolean use_envelope_request;
};