X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=5e5e998c845256443718becc8759e2b1dd569dc5;hb=216566521353a144d859e1d93d326934996d85a0;hp=afcffb011f4778de427ef4c2205c3091ff034e6c;hpb=15064a21ef26f67d41de4930badd03838978c9d7;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index afcffb01..5e5e998c 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -19,7 +19,7 @@
    reliable default values. If that value is GFX_ARG_UNDEFINED, it will
    be dynamically determined, using some of the other list values. */
 
-struct ConfigInfo image_config_suffix[] =
+struct ConfigTypeInfo image_config_suffix[] =
 {
   { ".x",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".y",				ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -436,21 +436,89 @@ struct ConfigInfo image_config[] =
   { "sp_port_any.ypos",				"2"			},
   { "sp_port_any.frames",			"1"			},
   { "sp_gravity_port_right",			"RocksSP.pcx"		},
-  { "sp_gravity_port_right.xpos",		"5"			},
+  { "sp_gravity_port_right.xpos",		"1"			},
   { "sp_gravity_port_right.ypos",		"1"			},
   { "sp_gravity_port_right.frames",		"1"			},
+  { "sp_gravity_port_right.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_port_right.EDITOR.xpos",	"5"			},
+  { "sp_gravity_port_right.EDITOR.ypos",	"1"			},
   { "sp_gravity_port_down",			"RocksSP.pcx"		},
-  { "sp_gravity_port_down.xpos",		"6"			},
+  { "sp_gravity_port_down.xpos",		"2"			},
   { "sp_gravity_port_down.ypos",		"1"			},
   { "sp_gravity_port_down.frames",		"1"			},
+  { "sp_gravity_port_down.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_port_down.EDITOR.xpos",		"6"			},
+  { "sp_gravity_port_down.EDITOR.ypos",		"1"			},
   { "sp_gravity_port_left",			"RocksSP.pcx"		},
-  { "sp_gravity_port_left.xpos",		"7"			},
+  { "sp_gravity_port_left.xpos",		"3"			},
   { "sp_gravity_port_left.ypos",		"1"			},
   { "sp_gravity_port_left.frames",		"1"			},
+  { "sp_gravity_port_left.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_port_left.EDITOR.xpos",		"7"			},
+  { "sp_gravity_port_left.EDITOR.ypos",		"1"			},
   { "sp_gravity_port_up",			"RocksSP.pcx"		},
-  { "sp_gravity_port_up.xpos",			"0"			},
-  { "sp_gravity_port_up.ypos",			"2"			},
+  { "sp_gravity_port_up.xpos",			"4"			},
+  { "sp_gravity_port_up.ypos",			"1"			},
   { "sp_gravity_port_up.frames",		"1"			},
+  { "sp_gravity_port_up.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_port_up.EDITOR.xpos",		"0"			},
+  { "sp_gravity_port_up.EDITOR.ypos",		"2"			},
+  { "sp_gravity_on_port_right",			"RocksSP.pcx"		},
+  { "sp_gravity_on_port_right.xpos",		"1"			},
+  { "sp_gravity_on_port_right.ypos",		"1"			},
+  { "sp_gravity_on_port_right.frames",		"1"			},
+  { "sp_gravity_on_port_right.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_on_port_right.EDITOR.xpos",	"5"			},
+  { "sp_gravity_on_port_right.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_down",			"RocksSP.pcx"		},
+  { "sp_gravity_on_port_down.xpos",		"2"			},
+  { "sp_gravity_on_port_down.ypos",		"1"			},
+  { "sp_gravity_on_port_down.frames",		"1"			},
+  { "sp_gravity_on_port_down.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_on_port_down.EDITOR.xpos",	"6"			},
+  { "sp_gravity_on_port_down.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_left",			"RocksSP.pcx"		},
+  { "sp_gravity_on_port_left.xpos",		"3"			},
+  { "sp_gravity_on_port_left.ypos",		"1"			},
+  { "sp_gravity_on_port_left.frames",		"1"			},
+  { "sp_gravity_on_port_left.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_on_port_left.EDITOR.xpos",	"7"			},
+  { "sp_gravity_on_port_left.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_up",			"RocksSP.pcx"		},
+  { "sp_gravity_on_port_up.xpos",		"4"			},
+  { "sp_gravity_on_port_up.ypos",		"1"			},
+  { "sp_gravity_on_port_up.frames",		"1"			},
+  { "sp_gravity_on_port_up.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_on_port_up.EDITOR.xpos",	"0"			},
+  { "sp_gravity_on_port_up.EDITOR.ypos",	"2"			},
+  { "sp_gravity_off_port_right",		"RocksSP.pcx"		},
+  { "sp_gravity_off_port_right.xpos",		"1"			},
+  { "sp_gravity_off_port_right.ypos",		"1"			},
+  { "sp_gravity_off_port_right.frames",		"1"			},
+  { "sp_gravity_off_port_right.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_off_port_right.EDITOR.xpos",	"5"			},
+  { "sp_gravity_off_port_right.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_down",			"RocksSP.pcx"		},
+  { "sp_gravity_off_port_down.xpos",		"2"			},
+  { "sp_gravity_off_port_down.ypos",		"1"			},
+  { "sp_gravity_off_port_down.frames",		"1"			},
+  { "sp_gravity_off_port_down.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_off_port_down.EDITOR.xpos",	"6"			},
+  { "sp_gravity_off_port_down.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_left",			"RocksSP.pcx"		},
+  { "sp_gravity_off_port_left.xpos",		"3"			},
+  { "sp_gravity_off_port_left.ypos",		"1"			},
+  { "sp_gravity_off_port_left.frames",		"1"			},
+  { "sp_gravity_off_port_left.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_off_port_left.EDITOR.xpos",	"7"			},
+  { "sp_gravity_off_port_left.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_up",			"RocksSP.pcx"		},
+  { "sp_gravity_off_port_up.xpos",		"4"			},
+  { "sp_gravity_off_port_up.ypos",		"1"			},
+  { "sp_gravity_off_port_up.frames",		"1"			},
+  { "sp_gravity_off_port_up.EDITOR",		"RocksSP.pcx"		},
+  { "sp_gravity_off_port_up.EDITOR.xpos",	"0"			},
+  { "sp_gravity_off_port_up.EDITOR.ypos",	"2"			},
 
   { "sp_sniksnak",				"RocksSP.pcx"		},
   { "sp_sniksnak.xpos",				"1"			},
@@ -537,7 +605,8 @@ struct ConfigInfo image_config[] =
   { "sp_electron.xpos",				"8"			},
   { "sp_electron.ypos",				"10"			},
   { "sp_electron.frames",			"8"			},
-  { "sp_electron.delay",			"2"			},
+  { "sp_electron.delay",			"4"			},
+  { "sp_electron.global_sync",			"true"			},
   { "sp_electron.EDITOR",			"RocksSP.pcx"		},
   { "sp_electron.EDITOR.xpos",			"10"			},
   { "sp_electron.EDITOR.ypos",			"11"			},
@@ -3132,6 +3201,21 @@ struct ConfigInfo image_config[] =
   { "arrow_down.ypos",				"8"			},
   { "arrow_down.frames",			"1"			},
 
+  { "unknown",					"RocksFontEM.pcx"	},
+  { "unknown.xpos",				"15"			},
+  { "unknown.ypos",				"1"			},
+  { "unknown.frames",				"1"			},
+
+  { "trigger_element",				"RocksDC.pcx"		},
+  { "trigger_element.xpos",			"15"			},
+  { "trigger_element.ypos",			"14"			},
+  { "trigger_element.frames",			"1"			},
+
+  { "trigger_player",				"RocksDC.pcx"		},
+  { "trigger_player.xpos",			"15"			},
+  { "trigger_player.ypos",			"13"			},
+  { "trigger_player.frames",			"1"			},
+
 #include "conf_chr.c"	/* include auto-generated data structure definitions */
 #include "conf_cus.c"	/* include auto-generated data structure definitions */
 #include "conf_grp.c"	/* include auto-generated data structure definitions */
@@ -3680,6 +3764,7 @@ struct ConfigInfo image_config[] =
   { "background.SCORES",			UNDEFINED_FILENAME	},
   { "background.EDITOR",			UNDEFINED_FILENAME	},
   { "background.INFO",				UNDEFINED_FILENAME	},
+  { "background.INFO[ELEMENTS]",		UNDEFINED_FILENAME	},
   { "background.SETUP",				UNDEFINED_FILENAME	},
   { "background.DOOR",				UNDEFINED_FILENAME	},