projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup debug option for displaying frames per second (FPS)
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index e55f4c191330beaf0fee4ab2068d41910972f8ff..7b15ad919e70d9450952bcac78427425f7b9d6fe 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-1838,10
+1838,12
@@
#define GFX_SPECIAL_ARG_SUBMENU 29
#define GFX_SPECIAL_ARG_MENU 30
#define GFX_SPECIAL_ARG_TOONS 31
#define GFX_SPECIAL_ARG_SUBMENU 29
#define GFX_SPECIAL_ARG_MENU 30
#define GFX_SPECIAL_ARG_TOONS 31
-#define GFX_SPECIAL_ARG_FADING 32
-#define GFX_SPECIAL_ARG_QUIT 33
+#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 NUM_SPECIAL_GFX_ARGS 3
4
+#define NUM_SPECIAL_GFX_ARGS 3
6
/* 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
@@
-2058,10
+2060,12
@@
#define GAME_MODE_PSEUDO_SUBMENU 29
#define GAME_MODE_PSEUDO_MENU 30
#define GAME_MODE_PSEUDO_TOONS 31
#define GAME_MODE_PSEUDO_SUBMENU 29
#define GAME_MODE_PSEUDO_MENU 30
#define GAME_MODE_PSEUDO_TOONS 31
-#define GAME_MODE_PSEUDO_FADING 32
-#define GAME_MODE_QUIT 33
+#define GAME_MODE_PSEUDO_SCORESOLD 32
+#define GAME_MODE_PSEUDO_SCORESNEW 33
+#define GAME_MODE_PSEUDO_FADING 34
+#define GAME_MODE_QUIT 35
-#define NUM_GAME_MODES 3
4
+#define NUM_GAME_MODES 3
6
/* 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
@@
-2075,8
+2079,8
@@
/* program information and versioning definitions */
#define PROGRAM_VERSION_MAJOR 4
#define PROGRAM_VERSION_MINOR 0
/* program information and versioning definitions */
#define PROGRAM_VERSION_MAJOR 4
#define PROGRAM_VERSION_MINOR 0
-#define PROGRAM_VERSION_PATCH
0
-#define PROGRAM_VERSION_BUILD
2
+#define PROGRAM_VERSION_PATCH
1
+#define PROGRAM_VERSION_BUILD
1
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
@@
-2645,6
+2649,7
@@
struct GlobalInfo
int num_toons;
float frames_per_second;
int num_toons;
float frames_per_second;
+ boolean show_frames_per_second;
/* global values for fading screens and masking borders */
int border_status;
/* global values for fading screens and masking borders */
int border_status;
@@
-3176,6
+3181,7
@@
extern SetupFileHash *image_config_hash;
extern SetupFileHash *element_token_hash;
extern SetupFileHash *graphic_token_hash;
extern SetupFileHash *font_token_hash;
extern SetupFileHash *element_token_hash;
extern SetupFileHash *graphic_token_hash;
extern SetupFileHash *font_token_hash;
+extern SetupFileHash *hide_setup_hash;
extern struct ConfigTypeInfo image_config_suffix[];
extern struct ConfigTypeInfo sound_config_suffix[];
extern struct ConfigTypeInfo music_config_suffix[];
extern struct ConfigTypeInfo image_config_suffix[];
extern struct ConfigTypeInfo sound_config_suffix[];
extern struct ConfigTypeInfo music_config_suffix[];