X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=4971e8c7c13a25f3fc173df6417feb6c6d9925b0;hb=30f635b58c076871cee2630ce15ffd7019764b2e;hp=4640ac833e6bb6ec87ab9bf3c42cf35210d456ed;hpb=eb09b9aa5521e286723c668030825cd0e3470c3c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 4640ac83..4971e8c7 100644
--- 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			ActiveElement[MAX_NUM_ELEMENTS];
+int			ActiveButton[NUM_IMAGE_FILES];
+int			ActiveFont[NUM_FONTS];
+
 int			lev_fieldx, lev_fieldy;
 int			scroll_x, scroll_y;
 
@@ -106,12 +110,15 @@ struct SetupInfo	setup;
 struct GameInfo		game;
 struct GlobalInfo	global;
 struct BorderInfo	border;
-struct TitleInfo	title;
+struct TitleFadingInfo	fading;
+struct TitleFadingInfo	title_initial_default;
+struct TitleFadingInfo	title_default;
 struct TitleMessageInfo	titlemessage_initial_default;
 struct TitleMessageInfo	titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
 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;
@@ -121,6 +128,10 @@ struct MusicInfo       *music_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;
 
 
 /* ------------------------------------------------------------------------- */
@@ -1435,7 +1446,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "dc_gate_white",
     "gate",
-    "white gate"
+    "white door"
   },
   {
     "dc_gate_white_gray",
@@ -5068,6 +5079,46 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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",
@@ -5374,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,			},
+  { ".PANEL",			GFX_SPECIAL_ARG_PANEL,			},
   { ".PREVIEW",			GFX_SPECIAL_ARG_PREVIEW,		},
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
 
@@ -5433,6 +5485,8 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.game_info"		},
   { "font.info.elements"	},
   { "font.info.levelset"	},
+
+  { NULL			}
 };