projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070427-3-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index d978a588e30b7c36c2a716c47ad3729d833f17c9..4971e8c7c13a25f3fc173df6417feb6c6d9925b0 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-75,6
+75,10
@@
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int ActiveElement[MAX_NUM_ELEMENTS];
+int ActiveButton[NUM_IMAGE_FILES];
+int ActiveFont[NUM_FONTS];
+
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
@@
-114,6
+118,7
@@
struct TitleMessageInfo titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo titlemessage_default;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
struct TitleMessageInfo titlemessage_default;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
+struct InitInfo init;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
@@
-123,6
+128,10
@@
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
SetupFileHash *helptext_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
SetupFileHash *helptext_info = NULL;
+SetupFileHash *image_config_hash = NULL;
+SetupFileHash *element_token_hash = NULL;
+SetupFileHash *graphic_token_hash = NULL;
+SetupFileHash *font_token_hash = NULL;
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-1437,7
+1446,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"dc_gate_white",
"gate",
{
"dc_gate_white",
"gate",
- "white
gate
"
+ "white
door
"
},
{
"dc_gate_white_gray",
},
{
"dc_gate_white_gray",
@@
-5070,6
+5079,46
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"sb_default",
"-"
},
"sb_default",
"-"
},
+ {
+ "graphic_1",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_2",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_3",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_4",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_5",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_6",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_7",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_8",
+ "graphic",
+ "-"
+ },
{
"internal_clipboard_custom",
"internal",
{
"internal_clipboard_custom",
"internal",
@@
-5376,6
+5425,7
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
+ { ".PANEL", GFX_SPECIAL_ARG_PANEL, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
@@
-5435,6
+5485,8
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
+
+ { NULL }
};
};
@@
-5449,14
+5501,6
@@
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
{ NULL, 0 }
};
{ NULL, 0 }
};
-struct TitleFadingInfo fading_none =
-{
- ANIM_NONE,
- 0,
- 0,
- 0
-};
-
/* ========================================================================= */
/* main() */
/* ========================================================================= */
/* main() */