X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1282c695dfad181381f44ca742e33141b84ddc15;hb=f965a2a6e56dd5c1e91b306dfd52b38b1dd49537;hp=b781128a4d92a2e025d3657f8f53ac8e6d9db78c;hpb=b1750ae5f6404a4faacc38425e0b31c29ea12c37;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index b781128a..1282c695 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -67,6 +67,8 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".align",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".valign",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".sort_priority",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".class",				ARG_UNDEFINED,	TYPE_STRING	},
+  { ".style",				ARG_UNDEFINED,	TYPE_STRING	},
 
   { NULL,				NULL,		0		}
 };
@@ -281,7 +283,7 @@ struct ConfigInfo image_config[] =
   { "[sp_default].exploding.xpos",		"8"			},
   { "[sp_default].exploding.ypos",		"3"			},
   { "[sp_default].exploding.frames",		"8"			},
-  { "[sp_default].exploding.delay",		"3"			},
+  { "[sp_default].exploding.delay",		"4"			},
   { "[sp_default].exploding.anim_mode",		"linear"		},
 
   { "sp_zonk",					"RocksSP.pcx"		},
@@ -753,7 +755,7 @@ struct ConfigInfo image_config[] =
   { "sp_electron.exploding.xpos",		"8"			},
   { "sp_electron.exploding.ypos",		"4"			},
   { "sp_electron.exploding.frames",		"8"			},
-  { "sp_electron.exploding.delay",		"3"			},
+  { "sp_electron.exploding.delay",		"4"			},
   { "sp_electron.exploding.anim_mode",		"linear"		},
 
   { "sp_terminal",				"RocksSP.pcx"		},
@@ -4363,10 +4365,6 @@ struct ConfigInfo image_config[] =
   /* images not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
 
-#if 1
-  { "sp_objects",				"sp_objects.pcx"	},
-#endif
-
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
@@ -4383,6 +4381,16 @@ struct ConfigInfo image_config[] =
 #endif
 #endif
 
+  { "sp_frame_horizontal",			"RocksSP.pcx"		},
+  { "sp_frame_horizontal.xpos",			"7"			},
+  { "sp_frame_horizontal.ypos",			"14"			},
+  { "sp_frame_vertical",			"RocksSP.pcx"		},
+  { "sp_frame_vertical.xpos",			"6"			},
+  { "sp_frame_vertical.ypos",			"14"			},
+  { "sp_frame_corner",				"RocksSP.pcx"		},
+  { "sp_frame_corner.xpos",			"5"			},
+  { "sp_frame_corner.ypos",			"14"			},
+
   { "toon_1",					"RocksToons.pcx"	},
   { "toon_1.x",					"2"			},
   { "toon_1.y",					"72"			},
@@ -5401,10 +5409,16 @@ struct ConfigInfo image_config[] =
   { "menu.draw_yoffset.SETUP[ARTWORK]",		"0"			},
   { "menu.draw_xoffset.SETUP[INPUT]",		"0"			},
   { "menu.draw_yoffset.SETUP[INPUT]",		"0"			},
+  { "menu.draw_xoffset.SETUP[SHORTCUTS]",	"0"			},
+  { "menu.draw_yoffset.SETUP[SHORTCUTS]",	"0"			},
   { "menu.draw_xoffset.SETUP[SHORTCUTS_1]",	"0"			},
   { "menu.draw_yoffset.SETUP[SHORTCUTS_1]",	"0"			},
   { "menu.draw_xoffset.SETUP[SHORTCUTS_2]",	"0"			},
   { "menu.draw_yoffset.SETUP[SHORTCUTS_2]",	"0"			},
+  { "menu.draw_xoffset.SETUP[SHORTCUTS_3]",	"0"			},
+  { "menu.draw_yoffset.SETUP[SHORTCUTS_3]",	"0"			},
+  { "menu.draw_xoffset.SETUP[SHORTCUTS_4]",	"0"			},
+  { "menu.draw_yoffset.SETUP[SHORTCUTS_4]",	"0"			},
   { "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]",	"0"			},
   { "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]",	"0"			},
   { "menu.draw_xoffset.SETUP[CHOOSE_OTHER]",	"0"			},
@@ -5828,6 +5842,15 @@ struct ConfigInfo image_config[] =
   { "game.panel.time_ss.draw_masked",		"true"			},
   { "game.panel.time_ss.draw_order",		"0"			},
 
+  { "game.panel.frame.x",			"-1"			},
+  { "game.panel.frame.y",			"-1"			},
+  { "game.panel.frame.align",			"left"			},
+  { "game.panel.frame.valign",			"top"			},
+  { "game.panel.frame.digits",			"-1"			},
+  { "game.panel.frame.font",			"font.text_2"		},
+  { "game.panel.frame.draw_masked",		"true"			},
+  { "game.panel.frame.draw_order",		"0"			},
+
   { "game.panel.shield_normal.x",		"-1"			},
   { "game.panel.shield_normal.y",		"-1"			},
   { "game.panel.shield_normal.tile_size",	"16"			},