From e0d86c9bfb88170026ce642f02a7f6f41735b2ce Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 19 Dec 2002 00:41:32 +0100 Subject: [PATCH] rnd-20021219-1-src --- src/conf_gfx.c | 262 ++++++++++++++++++++++++++----------------------- src/conftime.h | 2 +- src/main.c | 36 ++++--- 3 files changed, 159 insertions(+), 141 deletions(-) diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 98dc3ace..886d9574 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -40,28 +40,28 @@ struct ConfigInfo image_config[] = { /* images for Boulder Dash style elements and actions */ - { "bd_wall", "RocksMore.pcx" }, - { "bd_wall.xpos", "4" }, - { "bd_wall.ypos", "1" }, + { "bd_wall", "RocksDC.pcx" }, + { "bd_wall.xpos", "12" }, + { "bd_wall.ypos", "9" }, { "bd_wall.frames", "1" }, - { "bd_rock", "RocksMore.pcx" }, - { "bd_rock.xpos", "4" }, - { "bd_rock.ypos", "2" }, + { "bd_rock", "RocksDC.pcx" }, + { "bd_rock.xpos", "12" }, + { "bd_rock.ypos", "10" }, { "bd_rock.frames", "1" }, - { "bd_rock.falling", "RocksMore.pcx" }, - { "bd_rock.falling.xpos", "4" }, - { "bd_rock.falling.ypos", "2" }, + { "bd_rock.falling", "RocksDC.pcx" }, + { "bd_rock.falling.xpos", "12" }, + { "bd_rock.falling.ypos", "10" }, { "bd_rock.falling.frames", "1" }, - { "bd_rock.moving_left", "RocksMore.pcx" }, - { "bd_rock.moving_left.xpos", "4" }, - { "bd_rock.moving_left.ypos", "2" }, + { "bd_rock.moving_left", "RocksDC.pcx" }, + { "bd_rock.moving_left.xpos", "12" }, + { "bd_rock.moving_left.ypos", "10" }, { "bd_rock.moving_left.frames", "4" }, { "bd_rock.moving_left.delay", "2" }, { "bd_rock.moving_left.mode_reverse", "1" }, - { "bd_rock.moving_right", "RocksMore.pcx" }, - { "bd_rock.moving_right.xpos", "4" }, - { "bd_rock.moving_right.ypos", "2" }, + { "bd_rock.moving_right", "RocksDC.pcx" }, + { "bd_rock.moving_right.xpos", "12" }, + { "bd_rock.moving_right.ypos", "10" }, { "bd_rock.moving_right.frames", "4" }, { "bd_rock.moving_right.start_frame", "1" }, { "bd_rock.moving_right.delay", "2" }, @@ -666,42 +666,50 @@ struct ConfigInfo image_config[] = { "bug_right.ypos", "4" }, { "bug_right.frames", "2" }, { "bug_right.delay", "4" }, + { "bug_right.offset", "128" }, { "bug_up", "RocksElements.pcx" }, - { "bug_up.xpos", "10" }, + { "bug_up.xpos", "9" }, { "bug_up.ypos", "4" }, { "bug_up.frames", "2" }, { "bug_up.delay", "4" }, + { "bug_up.offset", "128" }, { "bug_left", "RocksElements.pcx" }, - { "bug_left.xpos", "12" }, + { "bug_left.xpos", "10" }, { "bug_left.ypos", "4" }, { "bug_left.frames", "2" }, { "bug_left.delay", "4" }, + { "bug_left.offset", "128" }, { "bug_down", "RocksElements.pcx" }, - { "bug_down.xpos", "14" }, + { "bug_down.xpos", "11" }, { "bug_down.ypos", "4" }, { "bug_down.frames", "2" }, { "bug_down.delay", "4" }, + { "bug_down.offset", "128" }, { "spaceship_right", "RocksElements.pcx" }, { "spaceship_right.xpos", "8" }, { "spaceship_right.ypos", "3" }, { "spaceship_right.frames", "2" }, { "spaceship_right.delay", "4" }, + { "spaceship_right.offset", "128" }, { "spaceship_up", "RocksElements.pcx" }, - { "spaceship_up.xpos", "10" }, + { "spaceship_up.xpos", "9" }, { "spaceship_up.ypos", "3" }, { "spaceship_up.frames", "2" }, { "spaceship_up.delay", "4" }, + { "spaceship_up.offset", "128" }, { "spaceship_left", "RocksElements.pcx" }, - { "spaceship_left.xpos", "12" }, + { "spaceship_left.xpos", "10" }, { "spaceship_left.ypos", "3" }, { "spaceship_left.frames", "2" }, { "spaceship_left.delay", "4" }, + { "spaceship_left.offset", "128" }, { "spaceship_down", "RocksElements.pcx" }, - { "spaceship_down.xpos", "14" }, + { "spaceship_down.xpos", "11" }, { "spaceship_down.ypos", "3" }, { "spaceship_down.frames", "2" }, { "spaceship_down.delay", "4" }, + { "spaceship_down.offset", "128" }, { "yamyam", "RocksElements.pcx" }, { "yamyam.xpos", "0" }, @@ -814,13 +822,13 @@ struct ConfigInfo image_config[] = { "acid_splash_left.ypos", "10" }, { "acid_splash_left.frames", "4" }, { "acid_splash_left.delay", "2" }, - { "acid_splash_left.active.mode_linear", "1" }, + { "acid_splash_left.mode_linear", "1" }, { "acid_splash_right", "RocksHeroes.pcx" }, { "acid_splash_right.xpos", "12" }, { "acid_splash_right.ypos", "10" }, { "acid_splash_right.frames", "4" }, { "acid_splash_right.delay", "2" }, - { "acid_splash_right.active.mode_linear", "1" }, + { "acid_splash_right.mode_linear", "1" }, { "amoeba_drop", "RocksElements.pcx" }, { "amoeba_drop.xpos", "5" }, @@ -1021,13 +1029,13 @@ struct ConfigInfo image_config[] = { "balloon_send_any_direction.ypos", "0" }, { "balloon_send_any_direction.frames", "1" }, - { "spring", "RocksMore.pcx" }, - { "spring.xpos", "0" }, - { "spring.ypos", "5" }, + { "spring", "RocksDC.pcx" }, + { "spring.xpos", "8" }, + { "spring.ypos", "13" }, { "spring.frames", "1" }, - { "spring.moving", "RocksMore.pcx" }, - { "spring.moving.xpos", "0" }, - { "spring.moving.ypos", "5" }, + { "spring.moving", "RocksDC.pcx" }, + { "spring.moving.xpos", "8" }, + { "spring.moving.ypos", "13" }, { "spring.moving.frames", "1" }, { "emc_steelwall1", "RocksDC.pcx" }, @@ -1397,103 +1405,103 @@ struct ConfigInfo image_config[] = { "timegate.closing.delay", "6" }, { "timegate.closing.mode_reverse", "1" }, - { "pearl", "RocksMore.pcx" }, - { "pearl.xpos", "0" }, - { "pearl.ypos", "3" }, + { "pearl", "RocksDC.pcx" }, + { "pearl.xpos", "8" }, + { "pearl.ypos", "11" }, { "pearl.frames", "1" }, - { "pearl.breaking", "RocksMore.pcx" }, - { "pearl.breaking.xpos", "0" }, - { "pearl.breaking.ypos", "4" }, + { "pearl.breaking", "RocksDC.pcx" }, + { "pearl.breaking.xpos", "8" }, + { "pearl.breaking.ypos", "12" }, { "pearl.breaking.frames", "4" }, { "pearl.breaking.delay", "2" }, { "pearl.breaking.mode_linear", "4" }, - { "crystal", "RocksMore.pcx" }, - { "crystal.xpos", "1" }, - { "crystal.ypos", "3" }, + { "crystal", "RocksDC.pcx" }, + { "crystal.xpos", "9" }, + { "crystal.ypos", "11" }, { "crystal.frames", "1" }, - { "wall_pearl", "RocksMore.pcx" }, - { "wall_pearl.xpos", "2" }, - { "wall_pearl.ypos", "3" }, + { "wall_pearl", "RocksDC.pcx" }, + { "wall_pearl.xpos", "10" }, + { "wall_pearl.ypos", "11" }, { "wall_pearl.frames", "1" }, - { "wall_crystal", "RocksMore.pcx" }, - { "wall_crystal.xpos", "3" }, - { "wall_crystal.ypos", "3" }, + { "wall_crystal", "RocksDC.pcx" }, + { "wall_crystal.xpos", "11" }, + { "wall_crystal.ypos", "11" }, { "wall_crystal.frames", "1" }, /* images for DX Boulderdash style elements and actions */ - { "tube_right_down", "RocksMore.pcx" }, - { "tube_right_down.xpos", "1" }, - { "tube_right_down.ypos", "5" }, + { "tube_right_down", "RocksDC.pcx" }, + { "tube_right_down.xpos", "9" }, + { "tube_right_down.ypos", "13" }, { "tube_right_down.frames", "1" }, - { "tube_horizontal_down", "RocksMore.pcx" }, - { "tube_horizontal_down.xpos", "2" }, - { "tube_horizontal_down.ypos", "5" }, + { "tube_horizontal_down", "RocksDC.pcx" }, + { "tube_horizontal_down.xpos", "10" }, + { "tube_horizontal_down.ypos", "13" }, { "tube_horizontal_down.frames", "1" }, - { "tube_left_down", "RocksMore.pcx" }, - { "tube_left_down.xpos", "3" }, - { "tube_left_down.ypos", "5" }, + { "tube_left_down", "RocksDC.pcx" }, + { "tube_left_down.xpos", "11" }, + { "tube_left_down.ypos", "13" }, { "tube_left_down.frames", "1" }, - { "tube_horizontal", "RocksMore.pcx" }, - { "tube_horizontal.xpos", "0" }, - { "tube_horizontal.ypos", "6" }, + { "tube_horizontal", "RocksDC.pcx" }, + { "tube_horizontal.xpos", "8" }, + { "tube_horizontal.ypos", "14" }, { "tube_horizontal.frames", "1" }, - { "tube_vertical_right", "RocksMore.pcx" }, - { "tube_vertical_right.xpos", "1" }, - { "tube_vertical_right.ypos", "6" }, + { "tube_vertical_right", "RocksDC.pcx" }, + { "tube_vertical_right.xpos", "9" }, + { "tube_vertical_right.ypos", "14" }, { "tube_vertical_right.frames", "1" }, - { "tube_all", "RocksMore.pcx" }, - { "tube_all.xpos", "2" }, - { "tube_all.ypos", "6" }, + { "tube_all", "RocksDC.pcx" }, + { "tube_all.xpos", "10" }, + { "tube_all.ypos", "14" }, { "tube_all.frames", "1" }, - { "tube_vertical_left", "RocksMore.pcx" }, - { "tube_vertical_left.xpos", "3" }, - { "tube_vertical_left.ypos", "6" }, + { "tube_vertical_left", "RocksDC.pcx" }, + { "tube_vertical_left.xpos", "11" }, + { "tube_vertical_left.ypos", "14" }, { "tube_vertical_left.frames", "1" }, - { "tube_vertical", "RocksMore.pcx" }, - { "tube_vertical.xpos", "0" }, - { "tube_vertical.ypos", "7" }, + { "tube_vertical", "RocksDC.pcx" }, + { "tube_vertical.xpos", "8" }, + { "tube_vertical.ypos", "15" }, { "tube_vertical.frames", "1" }, - { "tube_right_up", "RocksMore.pcx" }, - { "tube_right_up.xpos", "1" }, - { "tube_right_up.ypos", "7" }, + { "tube_right_up", "RocksDC.pcx" }, + { "tube_right_up.xpos", "9" }, + { "tube_right_up.ypos", "15" }, { "tube_right_up.frames", "1" }, - { "tube_horizontal_up", "RocksMore.pcx" }, - { "tube_horizontal_up.xpos", "2" }, - { "tube_horizontal_up.ypos", "7" }, + { "tube_horizontal_up", "RocksDC.pcx" }, + { "tube_horizontal_up.xpos", "10" }, + { "tube_horizontal_up.ypos", "15" }, { "tube_horizontal_up.frames", "1" }, - { "tube_left_up", "RocksMore.pcx" }, - { "tube_left_up.xpos", "3" }, - { "tube_left_up.ypos", "7" }, + { "tube_left_up", "RocksDC.pcx" }, + { "tube_left_up.xpos", "11" }, + { "tube_left_up.ypos", "15" }, { "tube_left_up.frames", "1" }, - { "trap", "RocksMore.pcx" }, - { "trap.xpos", "4" }, - { "trap.ypos", "0" }, + { "trap", "RocksDC.pcx" }, + { "trap.xpos", "12" }, + { "trap.ypos", "8" }, { "trap.frames", "1" }, - { "trap.active", "RocksMore.pcx" }, - { "trap.active.xpos", "4" }, - { "trap.active.ypos", "0" }, + { "trap.active", "RocksDC.pcx" }, + { "trap.active.xpos", "12" }, + { "trap.active.ypos", "8" }, { "trap.active.frames", "4" }, { "trap.active.delay", "4" }, { "trap.active.mode_pingpong2", "1" }, - { "dx_supabomb", "RocksMore.pcx" }, - { "dx_supabomb.xpos", "7" }, - { "dx_supabomb.ypos", "1" }, + { "dx_supabomb", "RocksDC.pcx" }, + { "dx_supabomb.xpos", "15" }, + { "dx_supabomb.ypos", "9" }, { "dx_supabomb.frames", "1" }, /* images for Rocks'n'Diamonds style elements and actions */ @@ -1564,24 +1572,28 @@ struct ConfigInfo image_config[] = { "pacman_right.frames", "2" }, { "pacman_right.mode_reverse", "1" }, { "pacman_right.delay", "4" }, + { "pacman_right.offset", "128" }, { "pacman_up", "RocksElements.pcx" }, - { "pacman_up.xpos", "10" }, + { "pacman_up.xpos", "9" }, { "pacman_up.ypos", "5" }, { "pacman_up.frames", "2" }, { "pacman_up.mode_reverse", "1" }, { "pacman_up.delay", "4" }, + { "pacman_up.offset", "128" }, { "pacman_left", "RocksElements.pcx" }, - { "pacman_left.xpos", "12" }, + { "pacman_left.xpos", "10" }, { "pacman_left.ypos", "5" }, { "pacman_left.frames", "2" }, { "pacman_left.mode_reverse", "1" }, { "pacman_left.delay", "4" }, + { "pacman_left.offset", "128" }, { "pacman_down", "RocksElements.pcx" }, - { "pacman_down.xpos", "14" }, + { "pacman_down.xpos", "11" }, { "pacman_down.ypos", "5" }, { "pacman_down.frames", "2" }, { "pacman_down.mode_reverse", "1" }, { "pacman_down.delay", "4" }, + { "pacman_down.offset", "128" }, { "lamp", "RocksElements.pcx" }, { "lamp.xpos", "0" }, @@ -2470,38 +2482,38 @@ struct ConfigInfo image_config[] = { "invisible_steelwall_vertical.ypos", "13" }, { "invisible_steelwall_vertical.frames", "1" }, - { "arrow_blue_left", "RocksMore.pcx" }, - { "arrow_blue_left.xpos", "0" }, - { "arrow_blue_left.ypos", "0" }, + { "arrow_blue_left", "RocksDC.pcx" }, + { "arrow_blue_left.xpos", "8" }, + { "arrow_blue_left.ypos", "8" }, { "arrow_blue_left.frames", "1" }, - { "arrow_blue_right", "RocksMore.pcx" }, - { "arrow_blue_right.xpos", "1" }, - { "arrow_blue_right.ypos", "0" }, + { "arrow_blue_right", "RocksDC.pcx" }, + { "arrow_blue_right.xpos", "9" }, + { "arrow_blue_right.ypos", "8" }, { "arrow_blue_right.frames", "1" }, - { "arrow_blue_up", "RocksMore.pcx" }, - { "arrow_blue_up.xpos", "2" }, - { "arrow_blue_up.ypos", "0" }, + { "arrow_blue_up", "RocksDC.pcx" }, + { "arrow_blue_up.xpos", "10" }, + { "arrow_blue_up.ypos", "8" }, { "arrow_blue_up.frames", "1" }, - { "arrow_blue_down", "RocksMore.pcx" }, - { "arrow_blue_down.xpos", "3" }, - { "arrow_blue_down.ypos", "0" }, + { "arrow_blue_down", "RocksDC.pcx" }, + { "arrow_blue_down.xpos", "11" }, + { "arrow_blue_down.ypos", "8" }, { "arrow_blue_down.frames", "1" }, - { "arrow_red_left", "RocksMore.pcx" }, - { "arrow_red_left.xpos", "0" }, - { "arrow_red_left.ypos", "1" }, + { "arrow_red_left", "RocksDC.pcx" }, + { "arrow_red_left.xpos", "8" }, + { "arrow_red_left.ypos", "9" }, { "arrow_red_left.frames", "1" }, - { "arrow_red_right", "RocksMore.pcx" }, - { "arrow_red_right.xpos", "1" }, - { "arrow_red_right.ypos", "1" }, + { "arrow_red_right", "RocksDC.pcx" }, + { "arrow_red_right.xpos", "9" }, + { "arrow_red_right.ypos", "9" }, { "arrow_red_right.frames", "1" }, - { "arrow_red_up", "RocksMore.pcx" }, - { "arrow_red_up.xpos", "2" }, - { "arrow_red_up.ypos", "1" }, + { "arrow_red_up", "RocksDC.pcx" }, + { "arrow_red_up.xpos", "10" }, + { "arrow_red_up.ypos", "9" }, { "arrow_red_up.frames", "1" }, - { "arrow_red_down", "RocksMore.pcx" }, - { "arrow_red_down.xpos", "3" }, - { "arrow_red_down.ypos", "1" }, + { "arrow_red_down", "RocksDC.pcx" }, + { "arrow_red_down.xpos", "11" }, + { "arrow_red_down.ypos", "9" }, { "arrow_red_down.frames", "1" }, { "ball_red", "RocksElements.pcx" }, @@ -2521,21 +2533,21 @@ struct ConfigInfo image_config[] = { "ball_gray.ypos", "8" }, { "ball_gray.frames", "1" }, - { "scrollbar_blue", "RocksMore.pcx" }, - { "scrollbar_blue.xpos", "0" }, - { "scrollbar_blue.ypos", "2" }, + { "scrollbar_blue", "RocksDC.pcx" }, + { "scrollbar_blue.xpos", "8" }, + { "scrollbar_blue.ypos", "10" }, { "scrollbar_blue.frames", "1" }, - { "scrollbar_red", "RocksMore.pcx" }, - { "scrollbar_red.xpos", "1" }, - { "scrollbar_red.ypos", "2" }, + { "scrollbar_red", "RocksDC.pcx" }, + { "scrollbar_red.xpos", "9" }, + { "scrollbar_red.ypos", "10" }, { "scrollbar_red.frames", "1" }, - { "scrollbar_green", "RocksMore.pcx" }, - { "scrollbar_green.xpos", "2" }, - { "scrollbar_green.ypos", "2" }, + { "scrollbar_green", "RocksDC.pcx" }, + { "scrollbar_green.xpos", "10" }, + { "scrollbar_green.ypos", "10" }, { "scrollbar_green.frames", "1" }, - { "scrollbar_yellow", "RocksMore.pcx" }, - { "scrollbar_yellow.xpos", "3" }, - { "scrollbar_yellow.ypos", "2" }, + { "scrollbar_yellow", "RocksDC.pcx" }, + { "scrollbar_yellow.xpos", "11" }, + { "scrollbar_yellow.ypos", "10" }, { "scrollbar_yellow.frames", "1" }, #include "conf_chr.c" /* include auto-generated data structure definitions */ diff --git a/src/conftime.h b/src/conftime.h index 09d927ec..04a3c4c5 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2002-12-15 16:34]" +#define COMPILE_DATE_STRING "[2002-12-19 00:19]" diff --git a/src/main.c b/src/main.c index 034fa77b..ba87b736 100644 --- a/src/main.c +++ b/src/main.c @@ -194,14 +194,14 @@ struct ElementInfo element_info[MAX_ELEMENTS] = { "bomb", "bomb" }, { "magic_wall", "magic wall" }, /* 20 */ { "speed_pill", "speed pill" }, - { "acid", "acid pool" }, + { "acid", "acid" }, { "amoeba", "dropping amoeba" }, { "amoeba", "normal amoeba" }, { "nut", "nut with emerald" }, { "gameoflife", "Conway's wall of life" }, { "biomaze", "biomaze" }, { "dynamite", "burning dynamite" }, - { NULL, "unknown" }, + { "wall", "wall" }, { "robot_wheel", "magic wheel" }, /* 30 */ { "robot_wheel", "magic wheel (running)" }, { "key", "red key" }, @@ -235,7 +235,9 @@ struct ElementInfo element_info[MAX_ELEMENTS] = { "dark_yamyam", "dark yam yam" }, /* 60 */ { "bd_magic_wall", "magic wall (BD style)" }, { "wall", "invisible steel wall" }, - { NULL, "-" }, + + { NULL, "(not used)" }, + { "dynabomb_nr", "increases number of bombs" }, { "dynabomb_sz", "increases explosion size" }, { "dynabomb_xl", "increases power of explosion" }, @@ -272,12 +274,12 @@ struct ElementInfo element_info[MAX_ELEMENTS] = { "emerald", "purple emerald" }, { "wall", "wall with red emerald" }, { "wall", "wall with purple emerald" }, - { NULL, "unknown" }, /* 100 */ - { NULL, "unknown" }, - { NULL, "unknown" }, - { NULL, "unknown" }, - { NULL, "unknown" }, - { NULL, "normal wall (BD style)" }, + { "wall", "acid pool (top left)" }, /* 100 */ + { "wall", "acid pool (top right)" }, + { "wall", "acid pool (bottom left)" }, + { "wall", "acid pool (bottom)" }, + { "wall", "acid pool (bottom right)" }, + { "wall", "normal wall (BD style)" }, { "bd_rock", "rock (BD style)" }, { "exit", "open exit" }, { NULL, "black orb bomb" }, @@ -426,8 +428,9 @@ struct ElementInfo element_info[MAX_ELEMENTS] = { "gate", "gray door (EM style, yellow key)"}, { "gate", "gray door (EM style, green key)"}, { "gate", "gray door (EM style, blue key)"}, - { NULL, "unknown" }, - { NULL, "unknown" }, + + { NULL, "(not used)" }, + { NULL, "(not used)" }, /* 256 */ @@ -492,10 +495,13 @@ struct ElementInfo element_info[MAX_ELEMENTS] = { "mole", "mole (starts moving down)" }, { "wall", "steel wall (slanted)" }, { "sand", "invisible sand" }, - { NULL, "dx unknown 15" }, - { NULL, "dx unknown 42" }, - { NULL, "-" }, - { NULL, "-" }, /* 320 */ + + { NULL, "dx unknown element 15" }, + { NULL, "dx unknown element 42" }, + + { NULL, "(not used)" }, + { NULL, "(not used)" }, /* 320 */ + { "shield_deadly", "shield (deadly, kills enemies)"}, { "timegate", "time gate (open)" }, { "timegate", "time gate (closed)" }, -- 2.34.1