X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=56c3c61bb069cae106f55258187f8ede9d01d011;hb=8b04d496646e102dd15710ba091e2f37cadcec5e;hp=44a4ca802a364e37e667587726c3109f926af5e7;hpb=db796e071bbe21db45ac516e55eaf2ea7cee33d5;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 44a4ca80..56c3c61b 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -3484,45 +3484,45 @@ struct ConfigInfo image_config[] =
   { "current_ce_score.ypos",			"12"			},
   { "current_ce_score.frames",			"1"			},
 
-  { "last_ce_1",				"RocksMore.pcx"		},
-  { "last_ce_1.xpos",				"0"			},
-  { "last_ce_1.ypos",				"7"			},
-  { "last_ce_1.frames",				"1"			},
-
-  { "last_ce_2",				"RocksMore.pcx"		},
-  { "last_ce_2.xpos",				"1"			},
-  { "last_ce_2.ypos",				"7"			},
-  { "last_ce_2.frames",				"1"			},
-
-  { "last_ce_3",				"RocksMore.pcx"		},
-  { "last_ce_3.xpos",				"2"			},
-  { "last_ce_3.ypos",				"7"			},
-  { "last_ce_3.frames",				"1"			},
-
-  { "last_ce_4",				"RocksMore.pcx"		},
-  { "last_ce_4.xpos",				"3"			},
-  { "last_ce_4.ypos",				"7"			},
-  { "last_ce_4.frames",				"1"			},
-
-  { "last_ce_5",				"RocksMore.pcx"		},
-  { "last_ce_5.xpos",				"4"			},
-  { "last_ce_5.ypos",				"7"			},
-  { "last_ce_5.frames",				"1"			},
-
-  { "last_ce_6",				"RocksMore.pcx"		},
-  { "last_ce_6.xpos",				"5"			},
-  { "last_ce_6.ypos",				"7"			},
-  { "last_ce_6.frames",				"1"			},
-
-  { "last_ce_7",				"RocksMore.pcx"		},
-  { "last_ce_7.xpos",				"6"			},
-  { "last_ce_7.ypos",				"7"			},
-  { "last_ce_7.frames",				"1"			},
-
-  { "last_ce_8",				"RocksMore.pcx"		},
-  { "last_ce_8.xpos",				"7"			},
-  { "last_ce_8.ypos",				"7"			},
-  { "last_ce_8.frames",				"1"			},
+  { "prev_ce_1",				"RocksMore.pcx"		},
+  { "prev_ce_1.xpos",				"0"			},
+  { "prev_ce_1.ypos",				"7"			},
+  { "prev_ce_1.frames",				"1"			},
+
+  { "prev_ce_2",				"RocksMore.pcx"		},
+  { "prev_ce_2.xpos",				"1"			},
+  { "prev_ce_2.ypos",				"7"			},
+  { "prev_ce_2.frames",				"1"			},
+
+  { "prev_ce_3",				"RocksMore.pcx"		},
+  { "prev_ce_3.xpos",				"2"			},
+  { "prev_ce_3.ypos",				"7"			},
+  { "prev_ce_3.frames",				"1"			},
+
+  { "prev_ce_4",				"RocksMore.pcx"		},
+  { "prev_ce_4.xpos",				"3"			},
+  { "prev_ce_4.ypos",				"7"			},
+  { "prev_ce_4.frames",				"1"			},
+
+  { "prev_ce_5",				"RocksMore.pcx"		},
+  { "prev_ce_5.xpos",				"4"			},
+  { "prev_ce_5.ypos",				"7"			},
+  { "prev_ce_5.frames",				"1"			},
+
+  { "prev_ce_6",				"RocksMore.pcx"		},
+  { "prev_ce_6.xpos",				"5"			},
+  { "prev_ce_6.ypos",				"7"			},
+  { "prev_ce_6.frames",				"1"			},
+
+  { "prev_ce_7",				"RocksMore.pcx"		},
+  { "prev_ce_7.xpos",				"6"			},
+  { "prev_ce_7.ypos",				"7"			},
+  { "prev_ce_7.frames",				"1"			},
+
+  { "prev_ce_8",				"RocksMore.pcx"		},
+  { "prev_ce_8.xpos",				"7"			},
+  { "prev_ce_8.ypos",				"7"			},
+  { "prev_ce_8.frames",				"1"			},
 
   { "next_ce_1",				"RocksMore.pcx"		},
   { "next_ce_1.xpos",				"0"			},
@@ -4513,6 +4513,16 @@ struct ConfigInfo image_config[] =
 
   { "global.num_toons",				"20"			},
 
+  { "border.draw_masked.TITLE",			"false"			},
+  { "border.draw_masked.MAIN",			"false"			},
+  { "border.draw_masked.LEVELS",		"false"			},
+  { "border.draw_masked.SCORES",		"false"			},
+  { "border.draw_masked.EDITOR",		"false"			},
+  { "border.draw_masked.INFO",			"false"			},
+  { "border.draw_masked.SETUP",			"false"			},
+  { "border.draw_masked.PLAYING",		"false"			},
+  { "border.draw_masked.DOOR",			"false"			},
+
   { "menu.draw_xoffset",			"0"			},
   { "menu.draw_yoffset",			"0"			},
   { "menu.draw_xoffset.MAIN",			"0"			},
@@ -4535,6 +4545,9 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.SCORES",			"-1"			},
   { "menu.list_size.INFO",			"-1"			},
 
+  { "menu.fade_delay",				"250"			},
+  { "menu.post_delay",				"125"			},
+
   { "door_1.width",				"-1"			},
   { "door_1.height",				"-1"			},
   { "door_1.step_offset",			"2"			},
@@ -4555,24 +4568,18 @@ struct ConfigInfo image_config[] =
   { "preview.step_offset",			"1"			},
   { "preview.step_delay",			"50"			},
 
-#if DEBUG
-  { "game.level.x",				"-1"			},
-  { "game.level.y",				"-1"			},
-  { "game.gems.x",				"-1"			},
-  { "game.gems.y",				"-1"			},
-  { "game.bombs.x",				"-1"			},
-  { "game.bombs.y",				"-1"			},
-  { "game.keys.x",				"-1"			},
-  { "game.keys.y",				"-1"			},
-  { "game.score.x",				"-1"			},
-  { "game.score.y",				"-1"			},
-  { "game.time.x",				"-1"			},
-  { "game.time.y",				"-1"			},
-#if 0
-  { "game.tape.x",				"-1"			},
-  { "game.tape.y",				"-1"			},
-#endif
-#endif
+  { "game.panel.level.x",			"37"			},
+  { "game.panel.level.y",			"20"			},
+  { "game.panel.gems.x",			"29"			},
+  { "game.panel.gems.y",			"54"			},
+  { "game.panel.inventory.x",			"29"			},
+  { "game.panel.inventory.y",			"89"			},
+  { "game.panel.keys.x",			"18"			},
+  { "game.panel.keys.y",			"123"			},
+  { "game.panel.score.x",			"15"			},
+  { "game.panel.score.y",			"159"			},
+  { "game.panel.time.x",			"29"			},
+  { "game.panel.time.y",			"194"			},
 
   { "[player].boring_delay_fixed",		"1000"			},
   { "[player].boring_delay_random",		"1000"			},