projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070320-3-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 6d80a9b225ffbbcbc24947a391e0591e30d5e826..e400c20e7dfa7df68dbfa50ad63fe0c512891a3e 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-1720,8
+1720,8
@@
/* values for special image configuration suffixes (must match game mode) */
#define GFX_SPECIAL_ARG_DEFAULT 0
/* values for special image configuration suffixes (must match game mode) */
#define GFX_SPECIAL_ARG_DEFAULT 0
-#define GFX_SPECIAL_ARG_TITLE
1
-#define GFX_SPECIAL_ARG_
MESSAGE
2
+#define GFX_SPECIAL_ARG_TITLE
_INITIAL
1
+#define GFX_SPECIAL_ARG_
TITLE
2
#define GFX_SPECIAL_ARG_MAIN 3
#define GFX_SPECIAL_ARG_LEVELS 4
#define GFX_SPECIAL_ARG_SCORES 5
#define GFX_SPECIAL_ARG_MAIN 3
#define GFX_SPECIAL_ARG_LEVELS 4
#define GFX_SPECIAL_ARG_SCORES 5
@@
-1869,8
+1869,8
@@
/* values for game_status (must match special image configuration suffixes) */
#define GAME_MODE_DEFAULT 0
/* values for game_status (must match special image configuration suffixes) */
#define GAME_MODE_DEFAULT 0
-#define GAME_MODE_TITLE
1
-#define GAME_MODE_
MESSAGE
2
+#define GAME_MODE_TITLE
_INITIAL
1
+#define GAME_MODE_
TITLE
2
#define GAME_MODE_MAIN 3
#define GAME_MODE_LEVELS 4
#define GAME_MODE_SCORES 5
#define GAME_MODE_MAIN 3
#define GAME_MODE_LEVELS 4
#define GAME_MODE_SCORES 5
@@
-2047,15
+2047,12
@@
struct MenuMainInfo
struct MenuMainInputInfo input;
};
struct MenuMainInputInfo input;
};
-struct TitleInfo
+struct Title
Fading
Info
{
{
+ int anim_mode;
int fade_delay;
int post_delay;
int auto_delay;
int fade_delay;
int post_delay;
int auto_delay;
-
- int fade_delay_final;
- int post_delay_final;
- int auto_delay_final;
};
struct TitleMessageInfo
};
struct TitleMessageInfo
@@
-2067,8
+2064,13
@@
struct TitleMessageInfo
int font;
boolean autowrap;
boolean centered;
int font;
boolean autowrap;
boolean centered;
- boolean
skip
_comments;
+ boolean
parse
_comments;
int sort_priority;
int sort_priority;
+
+ int anim_mode;
+ int fade_delay;
+ int post_delay;
+ int auto_delay;
};
struct MenuInfo
};
struct MenuInfo
@@
-2082,9
+2084,8
@@
struct MenuInfo
int list_size[NUM_SPECIAL_GFX_ARGS];
int list_size[NUM_SPECIAL_GFX_ARGS];
- int fade_delay;
- int post_delay;
- int auto_delay;
+ struct TitleFadingInfo navigation;
+ struct TitleFadingInfo destination;
int sound[NUM_SPECIAL_GFX_ARGS];
int music[NUM_SPECIAL_GFX_ARGS];
int sound[NUM_SPECIAL_GFX_ARGS];
int music[NUM_SPECIAL_GFX_ARGS];
@@
-2684,8
+2685,13
@@
extern struct HiScore highscore[];
extern struct TapeInfo tape;
extern struct GlobalInfo global;
extern struct BorderInfo border;
extern struct TapeInfo tape;
extern struct GlobalInfo global;
extern struct BorderInfo border;
-extern struct TitleInfo title;
+extern struct TitleFadingInfo fading;
+extern struct TitleFadingInfo fading_none;
+extern struct TitleFadingInfo title_initial_default;
+extern struct TitleFadingInfo title_default;
+extern struct TitleMessageInfo titlemessage_initial_default;
extern struct TitleMessageInfo titlemessage_initial[];
extern struct TitleMessageInfo titlemessage_initial[];
+extern struct TitleMessageInfo titlemessage_default;
extern struct TitleMessageInfo titlemessage[];
extern struct TitleMessageInfo readme;
extern struct MenuInfo menu;
extern struct TitleMessageInfo titlemessage[];
extern struct TitleMessageInfo readme;
extern struct MenuInfo menu;