X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=f3bebdf5960ce02388e8a476cf51f2ce445e6383;hb=17c2de428378f092f928b516a5efc93fa12479e7;hp=f11bf658cdb53c96def4fb860edf2d42ea3e9de2;hpb=827ba2bca2dfb8d7af57786df4304b61f0a8466e;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index f11bf658..f3bebdf5 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -43,8 +43,8 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".delay",				"1",		TYPE_INTEGER	},
   { ".anim_mode",			ARG_UNDEFINED,	TYPE_STRING	},
   { ".global_sync",			"false",	TYPE_BOOLEAN	},
-  { ".crumbled_like",			ARG_UNDEFINED,	TYPE_TOKEN	},
-  { ".diggable_like",			ARG_UNDEFINED,	TYPE_TOKEN	},
+  { ".crumbled_like",			ARG_UNDEFINED,	TYPE_ELEMENT	},
+  { ".diggable_like",			ARG_UNDEFINED,	TYPE_ELEMENT	},
   { ".border_size",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".step_offset",			"4",		TYPE_INTEGER	},
   { ".step_delay",			"1",		TYPE_INTEGER	},
@@ -59,7 +59,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".post_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".name",				ARG_UNDEFINED,	TYPE_STRING	},
   { ".scale_up_factor",			ARG_UNDEFINED,	TYPE_INTEGER	},
-  { ".clone_from",			ARG_UNDEFINED,	TYPE_TOKEN	},
+  { ".clone_from",			ARG_UNDEFINED,	TYPE_GRAPHIC	},
   { ".fade_mode",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".fade_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".post_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -4684,6 +4684,8 @@ struct ConfigInfo image_config[] =
   { "font.title_2.y",				"0"			},
   { "font.title_2.width",			"14"			},
   { "font.title_2.height",			"14"			},
+  { "font.title_2.SETUP",			UNDEFINED_FILENAME	},
+  { "font.title_2.SETUP.clone_from",		"font.text_4"		},
 
   { "font.menu_1",				"RocksFontBig.pcx"	},
   { "font.menu_1.x",				"0"			},
@@ -4932,6 +4934,15 @@ struct ConfigInfo image_config[] =
   { "global.border",				"RocksScreen.pcx"	},
   { "global.door",				"RocksDoor.pcx"		},
 
+  { "global.busy",				"RocksBusy.pcx"		},
+  { "global.busy.x",				"0"			},
+  { "global.busy.y",				"0"			},
+  { "global.busy.width",			"32"			},
+  { "global.busy.height",			"32"			},
+  { "global.busy.frames",			"28"			},
+  { "global.busy.frames_per_line",		"7"			},
+  { "global.busy.delay",			"2"			},
+
   { "editor.element_border",			"RocksElements.pcx"	},
   { "editor.element_border.xpos",		"0"			},
   { "editor.element_border.ypos",		"0"			},
@@ -5273,6 +5284,13 @@ struct ConfigInfo image_config[] =
   { "border.draw_masked.PLAYING",		"false"			},
   { "border.draw_masked.DOOR",			"false"			},
 
+  { "border.draw_masked_when_fading",		"true"			},
+
+  { "init.busy.x",				"336"			},
+  { "init.busy.y",				"280"			},
+  { "init.busy.align",				"center"		},
+  { "init.busy.valign",				"middle"		},
+
   { "menu.enter_menu.fade_mode",		"none"			},
   { "menu.enter_menu.fade_delay",		"250"			},
   { "menu.enter_menu.post_delay",		"125"			},
@@ -5282,6 +5300,9 @@ struct ConfigInfo image_config[] =
   { "menu.enter_screen.fade_mode",		"fade"			},
   { "menu.enter_screen.fade_delay",		"250"			},
   { "menu.enter_screen.post_delay",		"125"			},
+  { "menu.next_screen.fade_mode",		"crossfade"		},
+  { "menu.next_screen.fade_delay",		"250"			},
+  { "menu.next_screen.post_delay",		"125"			},
   { "menu.leave_screen.fade_mode",		"fade"			},
   { "menu.leave_screen.fade_delay",		"250"			},
   { "menu.leave_screen.post_delay",		"125"			},
@@ -6312,6 +6333,7 @@ struct ConfigInfo image_config[] =
   { "game.button.sound_simple.y",		"245"			},
 
   { "game.forced_scroll_delay_value",		"-1"			},
+  { "game.use_native_emc_graphics_engine",	"false"			},
 
   { "[player].boring_delay_fixed",		"1000"			},
   { "[player].boring_delay_random",		"1000"			},