X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=745a464e02944e3e82f8b51c0e59a4d95f772264;hp=fd0551f56650710d6fdaaf4805aff72cf64b25b7;hb=b270fc80ba831c22d288ce68c2dde728c97d2333;hpb=cb586ba720ddae3c6d05ba1723b5bd4d58bc98bd

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index fd0551f5..745a464e 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -52,7 +52,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".position",			ARG_UNDEFINED,	TYPE_STRING	},
   { ".draw_xoffset",			"0",		TYPE_INTEGER	},
   { ".draw_yoffset",			"0",		TYPE_INTEGER	},
-  { ".draw_masked",			"false",	TYPE_BOOLEAN	},
+  { ".draw_masked",			ARG_UNDEFINED,	TYPE_BOOLEAN	},
   { ".draw_order",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".init_delay_fixed",		ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".init_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -60,6 +60,8 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".anim_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".post_delay_fixed",		ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".post_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".init_event",			ARG_UNDEFINED,	TYPE_STRING	},
+  { ".anim_event",			ARG_UNDEFINED,	TYPE_STRING	},
   { ".name",				ARG_UNDEFINED,	TYPE_STRING	},
   { ".scale_up_factor",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".tile_size",			ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -4601,6 +4603,30 @@ struct ConfigInfo image_config[] =
   { "gfx.global.anim_6",			UNDEFINED_FILENAME	},
   { "gfx.global.anim_7",			UNDEFINED_FILENAME	},
   { "gfx.global.anim_8",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_9",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_10",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_11",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_12",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_13",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_14",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_15",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_16",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_17",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_18",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_19",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_20",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_21",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_22",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_23",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_24",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_25",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_26",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_27",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_28",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_29",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_30",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_31",			UNDEFINED_FILENAME	},
+  { "gfx.global.anim_32",			UNDEFINED_FILENAME	},
 
   { "global.anim_1",				UNDEFINED_FILENAME	},
   { "global.anim_2",				UNDEFINED_FILENAME	},
@@ -4610,6 +4636,30 @@ struct ConfigInfo image_config[] =
   { "global.anim_6",				UNDEFINED_FILENAME	},
   { "global.anim_7",				UNDEFINED_FILENAME	},
   { "global.anim_8",				UNDEFINED_FILENAME	},
+  { "global.anim_9",				UNDEFINED_FILENAME	},
+  { "global.anim_10",				UNDEFINED_FILENAME	},
+  { "global.anim_11",				UNDEFINED_FILENAME	},
+  { "global.anim_12",				UNDEFINED_FILENAME	},
+  { "global.anim_13",				UNDEFINED_FILENAME	},
+  { "global.anim_14",				UNDEFINED_FILENAME	},
+  { "global.anim_15",				UNDEFINED_FILENAME	},
+  { "global.anim_16",				UNDEFINED_FILENAME	},
+  { "global.anim_17",				UNDEFINED_FILENAME	},
+  { "global.anim_18",				UNDEFINED_FILENAME	},
+  { "global.anim_19",				UNDEFINED_FILENAME	},
+  { "global.anim_20",				UNDEFINED_FILENAME	},
+  { "global.anim_21",				UNDEFINED_FILENAME	},
+  { "global.anim_22",				UNDEFINED_FILENAME	},
+  { "global.anim_23",				UNDEFINED_FILENAME	},
+  { "global.anim_24",				UNDEFINED_FILENAME	},
+  { "global.anim_25",				UNDEFINED_FILENAME	},
+  { "global.anim_26",				UNDEFINED_FILENAME	},
+  { "global.anim_27",				UNDEFINED_FILENAME	},
+  { "global.anim_28",				UNDEFINED_FILENAME	},
+  { "global.anim_29",				UNDEFINED_FILENAME	},
+  { "global.anim_30",				UNDEFINED_FILENAME	},
+  { "global.anim_31",				UNDEFINED_FILENAME	},
+  { "global.anim_32",				UNDEFINED_FILENAME	},
 
   { "internal.global.toon_default",		UNDEFINED_FILENAME	},
   { "internal.global.toon_default.anim_mode",	"random"		},
@@ -5482,6 +5532,8 @@ struct ConfigInfo image_config[] =
   { "gfx.editor.button.element_right.height",	"16"			},
   { "gfx.editor.button.element_right.pressed_xoffset", "0"		},
 
+  { "gfx.editor.button.palette",		UNDEFINED_FILENAME	},
+
   { "editor.no_toolbox_button",			"RocksDoor.png"		},
   { "editor.no_toolbox_button.x",		"506"			},
   { "editor.no_toolbox_button.y",		"286"			},
@@ -7696,6 +7748,9 @@ struct ConfigInfo image_config[] =
   { "editor.button.element_right.y",		"-1"			},
   { "editor.button.element_right.tile_size",	"-1"			},
 
+  { "editor.button.palette.x",			"-1"			},
+  { "editor.button.palette.y",			"-1"			},
+
   { "editor.button.draw_single.x",		"6"			},
   { "editor.button.draw_single.y",		"6"			},
   { "editor.button.draw_connected.x",		"28"			},
@@ -7761,6 +7816,8 @@ struct ConfigInfo image_config[] =
   { "editor.palette.cols",			"4"			},
   { "editor.palette.rows",			"10"			},
   { "editor.palette.tile_size",			"16"			},
+  { "editor.palette.show_as_separate_screen",	"false"			},
+  { "editor.palette.show_on_element_buttons",	"false"			},
 
   { "editor.palette.element_left.x",		"6"			},
   { "editor.palette.element_left.y",		"258"			},