X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fconf_gfx.c;h=868fb084a3f80ba5ae8391c46426caf4dbb2ef35;hb=cf66875e6822d1c45987ef4dee02556de95fc454;hp=d918b8c5f893844a3985d9f1c7f354d7a6edcfda;hpb=6c244f56b4911dc83930193a43497388b91696af;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d918b8c5..868fb084 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"			},
@@ -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,35 +3249,50 @@ 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.input",				"RocksFontSmall.pcx"	},
-  { "font.input.x",				"0"			},
-  { "font.input.y",				"210"			},
-  { "font.input.width",				"14"			},
-  { "font.input.height",			"14"			},
-  { "font.input.MAIN",				"RocksFontBig.pcx"	},
-  { "font.input.MAIN.x",			"0"			},
-  { "font.input.MAIN.y",			"0"			},
-  { "font.input.MAIN.width",			"32"			},
-  { "font.input.MAIN.height",			"32"			},
-  { "font.input.active",			"RocksFontSmall.pcx"	},
-  { "font.input.active.x",			"0"			},
-  { "font.input.active.y",			"0"			},
-  { "font.input.active.width",			"14"			},
-  { "font.input.active.height",			"14"			},
-  { "font.input.active.MAIN",			"RocksFontBig.pcx"	},
-  { "font.input.active.MAIN.x",			"0"			},
-  { "font.input.active.MAIN.y",			"480"			},
-  { "font.input.active.MAIN.width",		"32"			},
-  { "font.input.active.MAIN.height",		"32"			},
-  { "font.input.active.SETUP",			"RocksFontBig.pcx"	},
-  { "font.input.active.SETUP.x",		"0"			},
-  { "font.input.active.SETUP.y",		"0"			},
-  { "font.input.active.SETUP.width",		"32"			},
-  { "font.input.active.SETUP.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"			},
+  { "font.input_1.y",				"210"			},
+  { "font.input_1.width",			"14"			},
+  { "font.input_1.height",			"14"			},
+  { "font.input_1.MAIN",			"RocksFontBig.pcx"	},
+  { "font.input_1.MAIN.x",			"0"			},
+  { "font.input_1.MAIN.y",			"0"			},
+  { "font.input_1.MAIN.width",			"32"			},
+  { "font.input_1.MAIN.height",			"32"			},
+  { "font.input_1.active",			"RocksFontSmall.pcx"	},
+  { "font.input_1.active.x",			"0"			},
+  { "font.input_1.active.y",			"210"			},
+  { "font.input_1.active.width",		"14"			},
+  { "font.input_1.active.height",		"14"			},
+  { "font.input_1.active.MAIN",			"RocksFontBig.pcx"	},
+  { "font.input_1.active.MAIN.x",		"0"			},
+  { "font.input_1.active.MAIN.y",		"480"			},
+  { "font.input_1.active.MAIN.width",		"32"			},
+  { "font.input_1.active.MAIN.height",		"32"			},
+  { "font.input_1.active.SETUP",		"RocksFontBig.pcx"	},
+  { "font.input_1.active.SETUP.x",		"0"			},
+  { "font.input_1.active.SETUP.y",		"0"			},
+  { "font.input_1.active.SETUP.width",		"32"			},
+  { "font.input_1.active.SETUP.height",		"32"			},
+  { "font.input_2",				"RocksFontSmall.pcx"	},
+  { "font.input_2.x",				"0"			},
+  { "font.input_2.y",				"210"			},
+  { "font.input_2.width",			"14"			},
+  { "font.input_2.height",			"14"			},
+  { "font.input_2.active",			"RocksFontSmall.pcx"	},
+  { "font.input_2.active.x",			"0"			},
+  { "font.input_2.active.y",			"210"			},
+  { "font.input_2.active.width",		"14"			},
+  { "font.input_2.active.height",		"14"			},
 
   { "font.option_off",				"RocksFontBig.pcx"	},
   { "font.option_off.x",			"0"			},
@@ -3312,8 +3354,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"			},
 
@@ -3321,6 +3363,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"			},