X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=913a3728888f4e97ec53c0d3ad59c9a82b57403d;hb=328e3b0f53ca41e626fda33427f5c51325bc700b;hp=70a30912420ec2ca4b5fa4c2b152f1801fd651dd;hpb=e85f102990a880fc2ec51e64a1f1ced4ad9e19df;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 70a30912..913a3728 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"		},
@@ -292,26 +294,26 @@ struct ConfigInfo image_config[] =
   { "sp_zonk.moving.left.xpos",			"0"			},
   { "sp_zonk.moving.left.ypos",			"6"			},
   { "sp_zonk.moving.left.frames",		"4"			},
-  { "sp_zonk.moving.left.delay",		"2"			},
+  { "sp_zonk.moving.left.delay",		"1"			},
   { "sp_zonk.moving.left.anim_mode",		"reverse"		},
   { "sp_zonk.moving.right",			"RocksSP.pcx"		},
   { "sp_zonk.moving.right.xpos",		"0"			},
   { "sp_zonk.moving.right.ypos",		"6"			},
   { "sp_zonk.moving.right.frames",		"4"			},
   { "sp_zonk.moving.right.start_frame",		"1"			},
-  { "sp_zonk.moving.right.delay",		"2"			},
+  { "sp_zonk.moving.right.delay",		"1"			},
   { "sp_zonk.pushing.left",			"RocksSP.pcx"		},
   { "sp_zonk.pushing.left.xpos",		"0"			},
   { "sp_zonk.pushing.left.ypos",		"6"			},
   { "sp_zonk.pushing.left.frames",		"4"			},
-  { "sp_zonk.pushing.left.delay",		"2"			},
+  { "sp_zonk.pushing.left.delay",		"1"			},
   { "sp_zonk.pushing.left.anim_mode",		"reverse"		},
   { "sp_zonk.pushing.right",			"RocksSP.pcx"		},
   { "sp_zonk.pushing.right.xpos",		"0"			},
   { "sp_zonk.pushing.right.ypos",		"6"			},
   { "sp_zonk.pushing.right.frames",		"4"			},
   { "sp_zonk.pushing.right.start_frame",	"1"			},
-  { "sp_zonk.pushing.right.delay",		"2"			},
+  { "sp_zonk.pushing.right.delay",		"1"			},
 
   { "sp_base",					"RocksSP.pcx"		},
   { "sp_base.xpos",				"2"			},
@@ -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"			},