X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fconf_gfx.c;h=0c98764c8336ab3b8b1b7b1717b8f37cad5a675d;hb=caf3da0a0e3af75eb8d10f83e5105581402b387e;hp=2b58e36c0c730f43300b1d6f60813fc38ed619df;hpb=ba30b2aedd9a673be5c23ebb2c5f25a4616daaa5;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 2b58e36c..0c98764c 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -267,6 +267,18 @@ struct ConfigInfo image_config[] =
   { "sp_murphy.digging.right.frames",		"3"			},
   { "sp_murphy.digging.right.anim_mode",	"pingpong"		},
   { "sp_murphy.digging.right.delay",		"2"			},
+  { "sp_murphy.collecting.left",		"RocksSP.pcx"		},
+  { "sp_murphy.collecting.left.xpos",		"8"			},
+  { "sp_murphy.collecting.left.ypos",		"0"			},
+  { "sp_murphy.collecting.left.frames",		"3"			},
+  { "sp_murphy.collecting.left.anim_mode",	"pingpong"		},
+  { "sp_murphy.collecting.left.delay",		"2"			},
+  { "sp_murphy.collecting.right",		"RocksSP.pcx"		},
+  { "sp_murphy.collecting.right.xpos",		"11"			},
+  { "sp_murphy.collecting.right.ypos",		"0"			},
+  { "sp_murphy.collecting.right.frames",	"3"			},
+  { "sp_murphy.collecting.right.anim_mode",	"pingpong"		},
+  { "sp_murphy.collecting.right.delay",		"2"			},
   { "sp_murphy.pushing.left",			"RocksSP.pcx"		},
   { "sp_murphy.pushing.left.xpos",		"11"			},
   { "sp_murphy.pushing.left.ypos",		"1"			},
@@ -947,7 +959,7 @@ struct ConfigInfo image_config[] =
   { "amoeba.shrinking.ypos",			"6"			},
   { "amoeba.shrinking.frames",			"3"			},
   { "amoeba.shrinking.delay",			"2"			},
-  { "amoeba.shrinking.anim_mode",		"loop,linear,reverse"	},
+  { "amoeba.shrinking.anim_mode",		"linear,reverse"	},
   { "amoeba_wet",				"RocksElements.pcx"	},
   { "amoeba_wet.xpos",				"8"			},
   { "amoeba_wet.ypos",				"6"			},
@@ -3160,16 +3172,21 @@ struct ConfigInfo image_config[] =
   { "font.text_1.LEVELS.y",			"0"			},
   { "font.text_1.LEVELS.width",			"16"			},
   { "font.text_1.LEVELS.height",		"32"			},
-  { "font.text_1.SCORES",			"RocksFontBig.pcx"	},
-  { "font.text_1.SCORES.x",			"0"			},
-  { "font.text_1.SCORES.y",			"320"			},
-  { "font.text_1.SCORES.width",			"32"			},
-  { "font.text_1.SCORES.height",		"32"			},
   { "font.text_1.PREVIEW",			"RocksFontEM.pcx"	},
   { "font.text_1.PREVIEW.x",			"0"			},
   { "font.text_1.PREVIEW.y",			"160"			},
   { "font.text_1.PREVIEW.width",		"16"			},
   { "font.text_1.PREVIEW.height",		"16"			},
+  { "font.text_1.SCORES",			"RocksFontMedium.pcx"	},
+  { "font.text_1.SCORES.x",			"0"			},
+  { "font.text_1.SCORES.y",			"480"			},
+  { "font.text_1.SCORES.width",			"16"			},
+  { "font.text_1.SCORES.height",		"32"			},
+  { "font.text_1.active.SCORES",		"RocksFontMedium.pcx"	},
+  { "font.text_1.active.SCORES.x",		"0"			},
+  { "font.text_1.active.SCORES.y",		"0"			},
+  { "font.text_1.active.SCORES.width",		"16"			},
+  { "font.text_1.active.SCORES.height",		"32"			},
   { "font.text_2",				"RocksFontSmall.pcx"	},
   { "font.text_2.x",				"0"			},
   { "font.text_2.y",				"210"			},
@@ -3180,16 +3197,21 @@ struct ConfigInfo image_config[] =
   { "font.text_2.LEVELS.y",			"160"			},
   { "font.text_2.LEVELS.width",			"16"			},
   { "font.text_2.LEVELS.height",		"32"			},
-  { "font.text_2.SCORES",			"RocksFontMedium.pcx"	},
-  { "font.text_2.SCORES.x",			"0"			},
-  { "font.text_2.SCORES.y",			"480"			},
-  { "font.text_2.SCORES.width",			"16"			},
-  { "font.text_2.SCORES.height",		"32"			},
   { "font.text_2.PREVIEW",			"RocksFontEM.pcx"	},
   { "font.text_2.PREVIEW.x",			"0"			},
   { "font.text_2.PREVIEW.y",			"160"			},
   { "font.text_2.PREVIEW.width",		"16"			},
   { "font.text_2.PREVIEW.height",		"16"			},
+  { "font.text_2.SCORES",			"RocksFontBig.pcx"	},
+  { "font.text_2.SCORES.x",			"0"			},
+  { "font.text_2.SCORES.y",			"320"			},
+  { "font.text_2.SCORES.width",			"32"			},
+  { "font.text_2.SCORES.height",		"32"			},
+  { "font.text_2.active.SCORES",		"RocksFontBig.pcx"	},
+  { "font.text_2.active.SCORES.x",		"0"			},
+  { "font.text_2.active.SCORES.y",		"0"			},
+  { "font.text_2.active.SCORES.width",		"32"			},
+  { "font.text_2.active.SCORES.height",		"32"			},
   { "font.text_3",				"RocksFontSmall.pcx"	},
   { "font.text_3.x",				"0"			},
   { "font.text_3.y",				"0"			},
@@ -3200,16 +3222,21 @@ struct ConfigInfo image_config[] =
   { "font.text_3.LEVELS.y",			"320"			},
   { "font.text_3.LEVELS.width",			"16"			},
   { "font.text_3.LEVELS.height",		"32"			},
-  { "font.text_3.SCORES",			"RocksFontBig.pcx"	},
-  { "font.text_3.SCORES.x",			"0"			},
-  { "font.text_3.SCORES.y",			"0"			},
-  { "font.text_3.SCORES.width",			"32"			},
-  { "font.text_3.SCORES.height",		"32"			},
   { "font.text_3.PREVIEW",			"RocksFontEM.pcx"	},
   { "font.text_3.PREVIEW.x",			"0"			},
   { "font.text_3.PREVIEW.y",			"160"			},
   { "font.text_3.PREVIEW.width",		"16"			},
   { "font.text_3.PREVIEW.height",		"16"			},
+  { "font.text_3.SCORES",			"RocksFontMedium.pcx"	},
+  { "font.text_3.SCORES.x",			"0"			},
+  { "font.text_3.SCORES.y",			"480"			},
+  { "font.text_3.SCORES.width",			"16"			},
+  { "font.text_3.SCORES.height",		"32"			},
+  { "font.text_3.active.SCORES",		"RocksFontMedium.pcx"	},
+  { "font.text_3.active.SCORES.x",		"0"			},
+  { "font.text_3.active.SCORES.y",		"0"			},
+  { "font.text_3.active.SCORES.width",		"16"			},
+  { "font.text_3.active.SCORES.height",		"32"			},
   { "font.text_4",				"RocksFontSmall.pcx"	},
   { "font.text_4.x",				"0"			},
   { "font.text_4.y",				"70"			},
@@ -3222,9 +3249,14 @@ struct ConfigInfo image_config[] =
   { "font.text_4.LEVELS.height",		"32"			},
   { "font.text_4.SCORES",			"RocksFontMedium.pcx"	},
   { "font.text_4.SCORES.x",			"0"			},
-  { "font.text_4.SCORES.y",			"0"			},
+  { "font.text_4.SCORES.y",			"480"			},
   { "font.text_4.SCORES.width",			"16"			},
   { "font.text_4.SCORES.height",		"32"			},
+  { "font.text_4.active.SCORES",		"RocksFontMedium.pcx"	},
+  { "font.text_4.active.SCORES.x",		"0"			},
+  { "font.text_4.active.SCORES.y",		"0"			},
+  { "font.text_4.active.SCORES.width",		"16"			},
+  { "font.text_4.active.SCORES.height",		"32"			},
 
   { "font.input_1",				"RocksFontSmall.pcx"	},
   { "font.input_1.x",				"0"			},
@@ -3313,6 +3345,10 @@ struct ConfigInfo image_config[] =
   { "editor.element_border.xpos",		"0"			},
   { "editor.element_border.ypos",		"0"			},
 
+  { "editor.element_border_input",		"RocksElements.pcx"	},
+  { "editor.element_border_input.xpos",		"0"			},
+  { "editor.element_border_input.ypos",		"0"			},
+
   { "background",				UNDEFINED_FILENAME	},
   { "background.MAIN",				UNDEFINED_FILENAME	},
   { "background.LEVELS",			UNDEFINED_FILENAME	},
@@ -3322,8 +3358,8 @@ struct ConfigInfo image_config[] =
   { "background.SETUP",				UNDEFINED_FILENAME	},
   { "background.DOOR",				UNDEFINED_FILENAME	},
 
-  /* the following directives are not associated with an image,
-     but make sense to be defined in "graphicsinfo.conf", too */
+  /* the following directives are not associated with an image, but
+     probably make sense to be defined in "graphicsinfo.conf", too */
 
   { "global.num_toons",				"20"			},
 
@@ -3331,6 +3367,16 @@ struct ConfigInfo image_config[] =
   { "menu.draw_yoffset",			"0"			},
   { "menu.draw_xoffset.MAIN",			"0"			},
   { "menu.draw_yoffset.MAIN",			"0"			},
+  { "menu.draw_xoffset.LEVELS",			"0"			},
+  { "menu.draw_yoffset.LEVELS",			"0"			},
+  { "menu.draw_xoffset.SCORES",			"0"			},
+  { "menu.draw_yoffset.SCORES",			"0"			},
+  { "menu.draw_xoffset.EDITOR",			"0"			},
+  { "menu.draw_yoffset.EDITOR",			"0"			},
+  { "menu.draw_xoffset.INFO",			"0"			},
+  { "menu.draw_yoffset.INFO",			"0"			},
+  { "menu.draw_xoffset.SETUP",			"0"			},
+  { "menu.draw_yoffset.SETUP",			"0"			},
 
   { "door.step_offset",				"2"			},
   { "door.step_delay",				"10"			},