X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf_e2g.c;h=45e85c93e27d1064aa348be7ff9ef77a37a0982f;hb=2bcba5d4d363ba2f58c9d3f22aba6a455522f499;hp=dd31ede8765f40eabb31af9aff77a856f31f8d46;hpb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;p=rocksndiamonds.git diff --git a/src/conf_e2g.c b/src/conf_e2g.c index dd31ede8..45e85c93 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -36,10 +36,6 @@ element_to_graphic[] = EL_BD_ROCK, -1, -1, IMG_BD_ROCK }, - { - EL_BD_ROCK, ACTION_FALLING, -1, - IMG_BD_ROCK_FALLING - }, { EL_BD_ROCK, ACTION_MOVING, MV_BIT_LEFT, IMG_BD_ROCK_MOVING_LEFT @@ -48,6 +44,14 @@ element_to_graphic[] = EL_BD_ROCK, ACTION_MOVING, MV_BIT_RIGHT, IMG_BD_ROCK_MOVING_RIGHT }, + { + EL_BD_ROCK, ACTION_PUSHING, MV_BIT_LEFT, + IMG_BD_ROCK_PUSHING_LEFT + }, + { + EL_BD_ROCK, ACTION_PUSHING, MV_BIT_RIGHT, + IMG_BD_ROCK_PUSHING_RIGHT + }, { EL_BD_DIAMOND, -1, -1, IMG_BD_DIAMOND @@ -181,12 +185,16 @@ element_to_graphic[] = IMG_BD_FIREFLY_MOVING }, { - EL_SP_ZONK, -1, -1, - IMG_SP_ZONK + EL_SP_DEFAULT, ACTION_EXPLODING, -1, + IMG_SP_DEFAULT_EXPLODING }, { - EL_SP_ZONK, ACTION_FALLING, -1, - IMG_SP_ZONK_FALLING + EL_SP_EMPTY_SPACE, -1, -1, + IMG_SP_EMPTY_SPACE + }, + { + EL_SP_ZONK, -1, -1, + IMG_SP_ZONK }, { EL_SP_ZONK, ACTION_MOVING, MV_BIT_LEFT, @@ -196,6 +204,14 @@ element_to_graphic[] = EL_SP_ZONK, ACTION_MOVING, MV_BIT_RIGHT, IMG_SP_ZONK_MOVING_RIGHT }, + { + EL_SP_ZONK, ACTION_PUSHING, MV_BIT_LEFT, + IMG_SP_ZONK_PUSHING_LEFT + }, + { + EL_SP_ZONK, ACTION_PUSHING, MV_BIT_RIGHT, + IMG_SP_ZONK_PUSHING_RIGHT + }, { EL_SP_BASE, -1, -1, IMG_SP_BASE @@ -220,6 +236,14 @@ element_to_graphic[] = EL_SP_MURPHY, ACTION_DIGGING, MV_BIT_RIGHT, IMG_SP_MURPHY_DIGGING_RIGHT }, + { + EL_SP_MURPHY, ACTION_COLLECTING, MV_BIT_LEFT, + IMG_SP_MURPHY_COLLECTING_LEFT + }, + { + EL_SP_MURPHY, ACTION_COLLECTING, MV_BIT_RIGHT, + IMG_SP_MURPHY_COLLECTING_RIGHT + }, { EL_SP_MURPHY, ACTION_PUSHING, MV_BIT_LEFT, IMG_SP_MURPHY_PUSHING_LEFT @@ -252,10 +276,6 @@ element_to_graphic[] = EL_SP_INFOTRON, -1, -1, IMG_SP_INFOTRON }, - { - EL_SP_INFOTRON, ACTION_FALLING, -1, - IMG_SP_INFOTRON_FALLING - }, { EL_SP_CHIP_SINGLE, -1, -1, IMG_SP_CHIP_SINGLE @@ -308,22 +328,10 @@ element_to_graphic[] = EL_SP_DISK_ORANGE, -1, -1, IMG_SP_DISK_ORANGE }, - { - EL_SP_DISK_ORANGE, ACTION_FALLING, -1, - IMG_SP_DISK_ORANGE_FALLING - }, - { - EL_SP_DISK_ORANGE, ACTION_PUSHING, -1, - IMG_SP_DISK_ORANGE_PUSHING - }, { EL_SP_DISK_YELLOW, -1, -1, IMG_SP_DISK_YELLOW }, - { - EL_SP_DISK_YELLOW, ACTION_PUSHING, -1, - IMG_SP_DISK_YELLOW_PUSHING - }, { EL_SP_DISK_RED, -1, -1, IMG_SP_DISK_RED @@ -332,14 +340,6 @@ element_to_graphic[] = EL_SP_DISK_RED, ACTION_COLLECTING, -1, IMG_SP_DISK_RED_COLLECTING }, - { - EL_SP_DISK_RED_ACTIVE, -1, -1, - IMG_SP_DISK_RED_ACTIVE - }, - { - EL_SP_DISK_RED, ACTION_ACTIVE, -1, - IMG_SP_DISK_RED_ACTIVE - }, { EL_SP_PORT_RIGHT, -1, -1, IMG_SP_PORT_RIGHT @@ -408,6 +408,10 @@ element_to_graphic[] = EL_SP_ELECTRON, -1, -1, IMG_SP_ELECTRON }, + { + EL_SP_ELECTRON, ACTION_EXPLODING, -1, + IMG_SP_ELECTRON_EXPLODING + }, { EL_SP_TERMINAL, -1, -1, IMG_SP_TERMINAL @@ -484,10 +488,42 @@ element_to_graphic[] = EL_SAND, -1, -1, IMG_SAND }, + { + EL_SAND, ACTION_DIGGING, MV_BIT_LEFT, + IMG_SAND_DIGGING_LEFT + }, + { + EL_SAND, ACTION_DIGGING, MV_BIT_RIGHT, + IMG_SAND_DIGGING_RIGHT + }, + { + EL_SAND, ACTION_DIGGING, MV_BIT_UP, + IMG_SAND_DIGGING_UP + }, + { + EL_SAND, ACTION_DIGGING, MV_BIT_DOWN, + IMG_SAND_DIGGING_DOWN + }, { EL_SAND_CRUMBLED, -1, -1, IMG_SAND_CRUMBLED }, + { + EL_SAND_CRUMBLED, ACTION_DIGGING, MV_BIT_LEFT, + IMG_SAND_CRUMBLED_DIGGING_LEFT + }, + { + EL_SAND_CRUMBLED, ACTION_DIGGING, MV_BIT_RIGHT, + IMG_SAND_CRUMBLED_DIGGING_RIGHT + }, + { + EL_SAND_CRUMBLED, ACTION_DIGGING, MV_BIT_UP, + IMG_SAND_CRUMBLED_DIGGING_UP + }, + { + EL_SAND_CRUMBLED, ACTION_DIGGING, MV_BIT_DOWN, + IMG_SAND_CRUMBLED_DIGGING_DOWN + }, { EL_WALL, -1, -1, IMG_WALL @@ -504,10 +540,6 @@ element_to_graphic[] = EL_ROCK, -1, -1, IMG_ROCK }, - { - EL_ROCK, ACTION_FALLING, -1, - IMG_ROCK_FALLING - }, { EL_ROCK, ACTION_MOVING, MV_BIT_LEFT, IMG_ROCK_MOVING_LEFT @@ -516,6 +548,14 @@ element_to_graphic[] = EL_ROCK, ACTION_MOVING, MV_BIT_RIGHT, IMG_ROCK_MOVING_RIGHT }, + { + EL_ROCK, ACTION_PUSHING, MV_BIT_LEFT, + IMG_ROCK_PUSHING_LEFT + }, + { + EL_ROCK, ACTION_PUSHING, MV_BIT_RIGHT, + IMG_ROCK_PUSHING_RIGHT + }, { EL_EMERALD, -1, -1, IMG_EMERALD @@ -528,6 +568,10 @@ element_to_graphic[] = EL_EMERALD, ACTION_FALLING, -1, IMG_EMERALD_FALLING }, + { + EL_EMERALD, ACTION_COLLECTING, -1, + IMG_EMERALD_COLLECTING + }, { EL_DIAMOND, -1, -1, IMG_DIAMOND @@ -540,6 +584,10 @@ element_to_graphic[] = EL_DIAMOND, ACTION_FALLING, -1, IMG_DIAMOND_FALLING }, + { + EL_DIAMOND, ACTION_COLLECTING, -1, + IMG_DIAMOND_COLLECTING + }, { EL_BOMB, -1, -1, IMG_BOMB @@ -548,18 +596,6 @@ element_to_graphic[] = EL_NUT, -1, -1, IMG_NUT }, - { - EL_NUT, ACTION_FALLING, -1, - IMG_NUT_FALLING - }, - { - EL_NUT, ACTION_MOVING, MV_BIT_LEFT, - IMG_NUT_MOVING_LEFT - }, - { - EL_NUT, ACTION_MOVING, MV_BIT_RIGHT, - IMG_NUT_MOVING_RIGHT - }, { EL_NUT_BREAKING, -1, -1, IMG_NUT_BREAKING @@ -588,6 +624,10 @@ element_to_graphic[] = EL_WALL_DIAMOND, -1, -1, IMG_WALL_DIAMOND }, + { + EL_BUG, -1, -1, + IMG_BUG + }, { EL_BUG_RIGHT, -1, -1, IMG_BUG_RIGHT @@ -620,6 +660,26 @@ element_to_graphic[] = EL_BUG, -1, MV_BIT_DOWN, IMG_BUG_DOWN }, + { + EL_BUG, ACTION_MOVING, MV_BIT_RIGHT, + IMG_BUG_MOVING_RIGHT + }, + { + EL_BUG, ACTION_MOVING, MV_BIT_UP, + IMG_BUG_MOVING_UP + }, + { + EL_BUG, ACTION_MOVING, MV_BIT_LEFT, + IMG_BUG_MOVING_LEFT + }, + { + EL_BUG, ACTION_MOVING, MV_BIT_DOWN, + IMG_BUG_MOVING_DOWN + }, + { + EL_SPACESHIP, -1, -1, + IMG_SPACESHIP + }, { EL_SPACESHIP_RIGHT, -1, -1, IMG_SPACESHIP_RIGHT @@ -652,6 +712,22 @@ element_to_graphic[] = EL_SPACESHIP, -1, MV_BIT_DOWN, IMG_SPACESHIP_DOWN }, + { + EL_SPACESHIP, ACTION_MOVING, MV_BIT_RIGHT, + IMG_SPACESHIP_MOVING_RIGHT + }, + { + EL_SPACESHIP, ACTION_MOVING, MV_BIT_UP, + IMG_SPACESHIP_MOVING_UP + }, + { + EL_SPACESHIP, ACTION_MOVING, MV_BIT_LEFT, + IMG_SPACESHIP_MOVING_LEFT + }, + { + EL_SPACESHIP, ACTION_MOVING, MV_BIT_DOWN, + IMG_SPACESHIP_MOVING_DOWN + }, { EL_YAMYAM, -1, -1, IMG_YAMYAM @@ -864,6 +940,10 @@ element_to_graphic[] = EL_BALLOON, ACTION_MOVING, -1, IMG_BALLOON_MOVING }, + { + EL_BALLOON, ACTION_PUSHING, -1, + IMG_BALLOON_PUSHING + }, { EL_BALLOON_SWITCH_LEFT, -1, -1, IMG_BALLOON_SWITCH_LEFT @@ -888,10 +968,6 @@ element_to_graphic[] = EL_SPRING, -1, -1, IMG_SPRING }, - { - EL_SPRING, ACTION_MOVING, -1, - IMG_SPRING_MOVING - }, { EL_EMC_STEELWALL_1, -1, -1, IMG_EMC_STEELWALL_1 @@ -1420,6 +1496,10 @@ element_to_graphic[] = EL_BIOMAZE, -1, -1, IMG_BIOMAZE }, + { + EL_PACMAN, -1, -1, + IMG_PACMAN + }, { EL_PACMAN_RIGHT, -1, -1, IMG_PACMAN_RIGHT @@ -1452,6 +1532,22 @@ element_to_graphic[] = EL_PACMAN, -1, MV_BIT_DOWN, IMG_PACMAN_DOWN }, + { + EL_PACMAN, ACTION_MOVING, MV_BIT_RIGHT, + IMG_PACMAN_MOVING_RIGHT + }, + { + EL_PACMAN, ACTION_MOVING, MV_BIT_UP, + IMG_PACMAN_MOVING_UP + }, + { + EL_PACMAN, ACTION_MOVING, MV_BIT_LEFT, + IMG_PACMAN_MOVING_LEFT + }, + { + EL_PACMAN, ACTION_MOVING, MV_BIT_DOWN, + IMG_PACMAN_MOVING_DOWN + }, { EL_LAMP, -1, -1, IMG_LAMP @@ -1584,26 +1680,66 @@ element_to_graphic[] = EL_DARK_YAMYAM, -1, -1, IMG_DARK_YAMYAM }, + { + EL_DYNABOMB, -1, -1, + IMG_DYNABOMB + }, { EL_DYNABOMB_ACTIVE, -1, -1, IMG_DYNABOMB_ACTIVE }, + { + EL_DYNABOMB, ACTION_ACTIVE, -1, + IMG_DYNABOMB_ACTIVE + }, + { + EL_DYNABOMB_PLAYER_1, -1, -1, + IMG_DYNABOMB_PLAYER_1 + }, { EL_DYNABOMB_PLAYER_1_ACTIVE, -1, -1, IMG_DYNABOMB_PLAYER_1_ACTIVE }, + { + EL_DYNABOMB_PLAYER_1, ACTION_ACTIVE, -1, + IMG_DYNABOMB_PLAYER_1_ACTIVE + }, + { + EL_DYNABOMB_PLAYER_2, -1, -1, + IMG_DYNABOMB_PLAYER_2 + }, { EL_DYNABOMB_PLAYER_2_ACTIVE, -1, -1, IMG_DYNABOMB_PLAYER_2_ACTIVE }, + { + EL_DYNABOMB_PLAYER_2, ACTION_ACTIVE, -1, + IMG_DYNABOMB_PLAYER_2_ACTIVE + }, + { + EL_DYNABOMB_PLAYER_3, -1, -1, + IMG_DYNABOMB_PLAYER_3 + }, { EL_DYNABOMB_PLAYER_3_ACTIVE, -1, -1, IMG_DYNABOMB_PLAYER_3_ACTIVE }, + { + EL_DYNABOMB_PLAYER_3, ACTION_ACTIVE, -1, + IMG_DYNABOMB_PLAYER_3_ACTIVE + }, + { + EL_DYNABOMB_PLAYER_4, -1, -1, + IMG_DYNABOMB_PLAYER_4 + }, { EL_DYNABOMB_PLAYER_4_ACTIVE, -1, -1, IMG_DYNABOMB_PLAYER_4_ACTIVE }, + { + EL_DYNABOMB_PLAYER_4, ACTION_ACTIVE, -1, + IMG_DYNABOMB_PLAYER_4_ACTIVE + }, { EL_DYNABOMB_INCREASE_NUMBER, -1, -1, IMG_DYNABOMB_INCREASE_NUMBER @@ -1828,10 +1964,6 @@ element_to_graphic[] = EL_SATELLITE, -1, -1, IMG_SATELLITE }, - { - EL_SATELLITE, ACTION_MOVING, -1, - IMG_SATELLITE_MOVING - }, { EL_STONEBLOCK, -1, -1, IMG_STONEBLOCK @@ -1888,6 +2020,22 @@ element_to_graphic[] = EL_PLAYER_1, ACTION_DIGGING, MV_BIT_RIGHT, IMG_PLAYER_1_DIGGING_RIGHT }, + { + EL_PLAYER_1, ACTION_COLLECTING, MV_BIT_DOWN, + IMG_PLAYER_1_COLLECTING_DOWN + }, + { + EL_PLAYER_1, ACTION_COLLECTING, MV_BIT_UP, + IMG_PLAYER_1_COLLECTING_UP + }, + { + EL_PLAYER_1, ACTION_COLLECTING, MV_BIT_LEFT, + IMG_PLAYER_1_COLLECTING_LEFT + }, + { + EL_PLAYER_1, ACTION_COLLECTING, MV_BIT_RIGHT, + IMG_PLAYER_1_COLLECTING_RIGHT + }, { EL_PLAYER_1, ACTION_PUSHING, MV_BIT_DOWN, IMG_PLAYER_1_PUSHING_DOWN @@ -1972,6 +2120,22 @@ element_to_graphic[] = EL_PLAYER_2, ACTION_DIGGING, MV_BIT_RIGHT, IMG_PLAYER_2_DIGGING_RIGHT }, + { + EL_PLAYER_2, ACTION_COLLECTING, MV_BIT_DOWN, + IMG_PLAYER_2_COLLECTING_DOWN + }, + { + EL_PLAYER_2, ACTION_COLLECTING, MV_BIT_UP, + IMG_PLAYER_2_COLLECTING_UP + }, + { + EL_PLAYER_2, ACTION_COLLECTING, MV_BIT_LEFT, + IMG_PLAYER_2_COLLECTING_LEFT + }, + { + EL_PLAYER_2, ACTION_COLLECTING, MV_BIT_RIGHT, + IMG_PLAYER_2_COLLECTING_RIGHT + }, { EL_PLAYER_2, ACTION_PUSHING, MV_BIT_DOWN, IMG_PLAYER_2_PUSHING_DOWN @@ -2056,6 +2220,22 @@ element_to_graphic[] = EL_PLAYER_3, ACTION_DIGGING, MV_BIT_RIGHT, IMG_PLAYER_3_DIGGING_RIGHT }, + { + EL_PLAYER_3, ACTION_COLLECTING, MV_BIT_DOWN, + IMG_PLAYER_3_COLLECTING_DOWN + }, + { + EL_PLAYER_3, ACTION_COLLECTING, MV_BIT_UP, + IMG_PLAYER_3_COLLECTING_UP + }, + { + EL_PLAYER_3, ACTION_COLLECTING, MV_BIT_LEFT, + IMG_PLAYER_3_COLLECTING_LEFT + }, + { + EL_PLAYER_3, ACTION_COLLECTING, MV_BIT_RIGHT, + IMG_PLAYER_3_COLLECTING_RIGHT + }, { EL_PLAYER_3, ACTION_PUSHING, MV_BIT_DOWN, IMG_PLAYER_3_PUSHING_DOWN @@ -2140,6 +2320,22 @@ element_to_graphic[] = EL_PLAYER_4, ACTION_DIGGING, MV_BIT_RIGHT, IMG_PLAYER_4_DIGGING_RIGHT }, + { + EL_PLAYER_4, ACTION_COLLECTING, MV_BIT_DOWN, + IMG_PLAYER_4_COLLECTING_DOWN + }, + { + EL_PLAYER_4, ACTION_COLLECTING, MV_BIT_UP, + IMG_PLAYER_4_COLLECTING_UP + }, + { + EL_PLAYER_4, ACTION_COLLECTING, MV_BIT_LEFT, + IMG_PLAYER_4_COLLECTING_LEFT + }, + { + EL_PLAYER_4, ACTION_COLLECTING, MV_BIT_RIGHT, + IMG_PLAYER_4_COLLECTING_RIGHT + }, { EL_PLAYER_4, ACTION_PUSHING, MV_BIT_DOWN, IMG_PLAYER_4_PUSHING_DOWN @@ -2173,8 +2369,8 @@ element_to_graphic[] = IMG_PLAYER_4_SNAPPING_RIGHT }, { - EL_EXPLOSION, -1, -1, - IMG_EXPLOSION + EL_DEFAULT, ACTION_EXPLODING, -1, + IMG_DEFAULT_EXPLODING }, { EL_STEELWALL_TOPLEFT, -1, -1, @@ -2553,36 +2749,48 @@ element_to_graphic[] = IMG_CHAR_Z }, { - EL_CHAR_AE, -1, -1, - IMG_CHAR_AE + EL_CHAR_BRACKETLEFT, -1, -1, + IMG_CHAR_BRACKETLEFT }, { - EL_CHAR_OE, -1, -1, - IMG_CHAR_OE + EL_CHAR_BACKSLASH, -1, -1, + IMG_CHAR_BACKSLASH }, { - EL_CHAR_UE, -1, -1, - IMG_CHAR_UE + EL_CHAR_BRACKETRIGHT, -1, -1, + IMG_CHAR_BRACKETRIGHT }, { - EL_CHAR_COPYRIGHT, -1, -1, - IMG_CHAR_COPYRIGHT + EL_CHAR_ASCIICIRCUM, -1, -1, + IMG_CHAR_ASCIICIRCUM }, { EL_CHAR_UNDERSCORE, -1, -1, IMG_CHAR_UNDERSCORE }, { - EL_CHAR_EMPTY, -1, -1, - IMG_CHAR_EMPTY + EL_CHAR_COPYRIGHT, -1, -1, + IMG_CHAR_COPYRIGHT + }, + { + EL_CHAR_AUMLAUT, -1, -1, + IMG_CHAR_AUMLAUT + }, + { + EL_CHAR_OUMLAUT, -1, -1, + IMG_CHAR_OUMLAUT + }, + { + EL_CHAR_UUMLAUT, -1, -1, + IMG_CHAR_UUMLAUT }, { EL_CHAR_DEGREE, -1, -1, IMG_CHAR_DEGREE }, { - EL_CHAR_TM, -1, -1, - IMG_CHAR_TM + EL_CHAR_TRADEMARK, -1, -1, + IMG_CHAR_TRADEMARK }, { EL_CHAR_CURSOR, -1, -1,