From ef8c5a2593702e86fb1566cfc25dda5f35df2ea0 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 18 Jan 2003 13:36:48 +0100 Subject: [PATCH] rnd-20030118-4-src --- src/conf_e2g.c | 300 +++++++++++++++++++++---------------------- src/conftime.h | 2 +- src/game.c | 89 ++++++------- src/init.c | 28 ++-- src/libgame/system.h | 2 +- src/main.h | 51 ++++---- src/tape.c | 4 +- src/tools.c | 12 +- 8 files changed, 238 insertions(+), 250 deletions(-) diff --git a/src/conf_e2g.c b/src/conf_e2g.c index af01c278..971d138f 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -37,15 +37,15 @@ element_to_graphic[] = IMG_BD_ROCK }, { - EL_BD_ROCK, -1, GFX_ACTION_FALLING, + EL_BD_ROCK, -1, ACTION_FALLING, IMG_BD_ROCK_FALLING }, { - EL_BD_ROCK, MV_LEFT, GFX_ACTION_MOVING, + EL_BD_ROCK, MV_LEFT, ACTION_MOVING, IMG_BD_ROCK_MOVING_LEFT }, { - EL_BD_ROCK, MV_RIGHT, GFX_ACTION_MOVING, + EL_BD_ROCK, MV_RIGHT, ACTION_MOVING, IMG_BD_ROCK_MOVING_RIGHT }, { @@ -53,11 +53,11 @@ element_to_graphic[] = IMG_BD_DIAMOND }, { - EL_BD_DIAMOND, -1, GFX_ACTION_MOVING, + EL_BD_DIAMOND, -1, ACTION_MOVING, IMG_BD_DIAMOND_MOVING }, { - EL_BD_DIAMOND, -1, GFX_ACTION_FALLING, + EL_BD_DIAMOND, -1, ACTION_FALLING, IMG_BD_DIAMOND_FALLING }, { @@ -109,7 +109,7 @@ element_to_graphic[] = IMG_BD_BUTTERFLY }, { - EL_BD_BUTTERFLY, -1, GFX_ACTION_MOVING, + EL_BD_BUTTERFLY, -1, ACTION_MOVING, IMG_BD_BUTTERFLY_MOVING }, { @@ -149,7 +149,7 @@ element_to_graphic[] = IMG_BD_FIREFLY }, { - EL_BD_FIREFLY, -1, GFX_ACTION_MOVING, + EL_BD_FIREFLY, -1, ACTION_MOVING, IMG_BD_FIREFLY_MOVING }, { @@ -193,15 +193,15 @@ element_to_graphic[] = IMG_SP_ZONK }, { - EL_SP_ZONK, -1, GFX_ACTION_FALLING, + EL_SP_ZONK, -1, ACTION_FALLING, IMG_SP_ZONK_FALLING }, { - EL_SP_ZONK, MV_LEFT, GFX_ACTION_MOVING, + EL_SP_ZONK, MV_LEFT, ACTION_MOVING, IMG_SP_ZONK_MOVING_LEFT }, { - EL_SP_ZONK, MV_RIGHT, GFX_ACTION_MOVING, + EL_SP_ZONK, MV_RIGHT, ACTION_MOVING, IMG_SP_ZONK_MOVING_RIGHT }, { @@ -217,19 +217,19 @@ element_to_graphic[] = IMG_SP_MURPHY_LEFT }, { - EL_SP_MURPHY, MV_LEFT, GFX_ACTION_MOVING, + EL_SP_MURPHY, MV_LEFT, ACTION_MOVING, IMG_SP_MURPHY_LEFT_MOVING }, { - EL_SP_MURPHY, MV_LEFT, GFX_ACTION_DIGGING, + EL_SP_MURPHY, MV_LEFT, ACTION_DIGGING, IMG_SP_MURPHY_LEFT_DIGGING }, { - EL_SP_MURPHY, MV_LEFT, GFX_ACTION_PUSHING, + EL_SP_MURPHY, MV_LEFT, ACTION_PUSHING, IMG_SP_MURPHY_LEFT_PUSHING }, { - EL_SP_MURPHY, MV_LEFT, GFX_ACTION_SNAPPING, + EL_SP_MURPHY, MV_LEFT, ACTION_SNAPPING, IMG_SP_MURPHY_LEFT_SNAPPING }, { @@ -237,19 +237,19 @@ element_to_graphic[] = IMG_SP_MURPHY_RIGHT }, { - EL_SP_MURPHY, MV_RIGHT, GFX_ACTION_MOVING, + EL_SP_MURPHY, MV_RIGHT, ACTION_MOVING, IMG_SP_MURPHY_RIGHT_MOVING }, { - EL_SP_MURPHY, MV_RIGHT, GFX_ACTION_DIGGING, + EL_SP_MURPHY, MV_RIGHT, ACTION_DIGGING, IMG_SP_MURPHY_RIGHT_DIGGING }, { - EL_SP_MURPHY, MV_RIGHT, GFX_ACTION_PUSHING, + EL_SP_MURPHY, MV_RIGHT, ACTION_PUSHING, IMG_SP_MURPHY_RIGHT_PUSHING }, { - EL_SP_MURPHY, MV_RIGHT, GFX_ACTION_SNAPPING, + EL_SP_MURPHY, MV_RIGHT, ACTION_SNAPPING, IMG_SP_MURPHY_RIGHT_SNAPPING }, { @@ -257,7 +257,7 @@ element_to_graphic[] = IMG_SP_MURPHY_UP }, { - EL_SP_MURPHY, MV_UP, GFX_ACTION_SNAPPING, + EL_SP_MURPHY, MV_UP, ACTION_SNAPPING, IMG_SP_MURPHY_UP_SNAPPING }, { @@ -265,7 +265,7 @@ element_to_graphic[] = IMG_SP_MURPHY_DOWN }, { - EL_SP_MURPHY, MV_DOWN, GFX_ACTION_SNAPPING, + EL_SP_MURPHY, MV_DOWN, ACTION_SNAPPING, IMG_SP_MURPHY_DOWN_SNAPPING }, { @@ -277,7 +277,7 @@ element_to_graphic[] = IMG_SP_INFOTRON }, { - EL_SP_INFOTRON, -1, GFX_ACTION_FALLING, + EL_SP_INFOTRON, -1, ACTION_FALLING, IMG_SP_INFOTRON_FALLING }, { @@ -333,11 +333,11 @@ element_to_graphic[] = IMG_SP_DISK_ORANGE }, { - EL_SP_DISK_ORANGE, -1, GFX_ACTION_FALLING, + EL_SP_DISK_ORANGE, -1, ACTION_FALLING, IMG_SP_DISK_ORANGE_FALLING }, { - EL_SP_DISK_ORANGE, -1, GFX_ACTION_PUSHING, + EL_SP_DISK_ORANGE, -1, ACTION_PUSHING, IMG_SP_DISK_ORANGE_PUSHING }, { @@ -345,7 +345,7 @@ element_to_graphic[] = IMG_SP_DISK_YELLOW }, { - EL_SP_DISK_YELLOW, -1, GFX_ACTION_PUSHING, + EL_SP_DISK_YELLOW, -1, ACTION_PUSHING, IMG_SP_DISK_YELLOW_PUSHING }, { @@ -353,7 +353,7 @@ element_to_graphic[] = IMG_SP_DISK_RED }, { - EL_SP_DISK_RED, -1, GFX_ACTION_COLLECTING, + EL_SP_DISK_RED, -1, ACTION_COLLECTING, IMG_SP_DISK_RED_COLLECTING }, { @@ -509,15 +509,15 @@ element_to_graphic[] = IMG_ROCK }, { - EL_ROCK, -1, GFX_ACTION_FALLING, + EL_ROCK, -1, ACTION_FALLING, IMG_ROCK_FALLING }, { - EL_ROCK, MV_LEFT, GFX_ACTION_MOVING, + EL_ROCK, MV_LEFT, ACTION_MOVING, IMG_ROCK_MOVING_LEFT }, { - EL_ROCK, MV_RIGHT, GFX_ACTION_MOVING, + EL_ROCK, MV_RIGHT, ACTION_MOVING, IMG_ROCK_MOVING_RIGHT }, { @@ -525,11 +525,11 @@ element_to_graphic[] = IMG_EMERALD }, { - EL_EMERALD, -1, GFX_ACTION_MOVING, + EL_EMERALD, -1, ACTION_MOVING, IMG_EMERALD_MOVING }, { - EL_EMERALD, -1, GFX_ACTION_FALLING, + EL_EMERALD, -1, ACTION_FALLING, IMG_EMERALD_FALLING }, { @@ -537,11 +537,11 @@ element_to_graphic[] = IMG_DIAMOND }, { - EL_DIAMOND, -1, GFX_ACTION_MOVING, + EL_DIAMOND, -1, ACTION_MOVING, IMG_DIAMOND_MOVING }, { - EL_DIAMOND, -1, GFX_ACTION_FALLING, + EL_DIAMOND, -1, ACTION_FALLING, IMG_DIAMOND_FALLING }, { @@ -553,15 +553,15 @@ element_to_graphic[] = IMG_NUT }, { - EL_NUT, -1, GFX_ACTION_FALLING, + EL_NUT, -1, ACTION_FALLING, IMG_NUT_FALLING }, { - EL_NUT, MV_LEFT, GFX_ACTION_MOVING, + EL_NUT, MV_LEFT, ACTION_MOVING, IMG_NUT_MOVING_LEFT }, { - EL_NUT, MV_RIGHT, GFX_ACTION_MOVING, + EL_NUT, MV_RIGHT, ACTION_MOVING, IMG_NUT_MOVING_RIGHT }, { @@ -653,7 +653,7 @@ element_to_graphic[] = IMG_YAMYAM }, { - EL_YAMYAM, -1, GFX_ACTION_MOVING, + EL_YAMYAM, -1, ACTION_MOVING, IMG_YAMYAM_MOVING }, { @@ -661,7 +661,7 @@ element_to_graphic[] = IMG_ROBOT }, { - EL_ROBOT, -1, GFX_ACTION_MOVING, + EL_ROBOT, -1, ACTION_MOVING, IMG_ROBOT_MOVING }, { @@ -801,19 +801,19 @@ element_to_graphic[] = IMG_AMOEBA_FULL }, { - EL_AMOEBA_FULL, -1, GFX_ACTION_OTHER, + EL_AMOEBA_FULL, -1, ACTION_OTHER, IMG_AMOEBA_FULL_PART1 }, { - EL_AMOEBA_FULL, -1, GFX_ACTION_OTHER, + EL_AMOEBA_FULL, -1, ACTION_OTHER, IMG_AMOEBA_FULL_PART2 }, { - EL_AMOEBA_FULL, -1, GFX_ACTION_OTHER, + EL_AMOEBA_FULL, -1, ACTION_OTHER, IMG_AMOEBA_FULL_PART3 }, { - EL_AMOEBA_FULL, -1, GFX_ACTION_OTHER, + EL_AMOEBA_FULL, -1, ACTION_OTHER, IMG_AMOEBA_FULL_PART4 }, { @@ -901,7 +901,7 @@ element_to_graphic[] = IMG_BALLOON }, { - EL_BALLOON, -1, GFX_ACTION_MOVING, + EL_BALLOON, -1, ACTION_MOVING, IMG_BALLOON_MOVING }, { @@ -929,7 +929,7 @@ element_to_graphic[] = IMG_SPRING }, { - EL_SPRING, -1, GFX_ACTION_MOVING, + EL_SPRING, -1, ACTION_MOVING, IMG_SPRING_MOVING }, { @@ -1429,11 +1429,11 @@ element_to_graphic[] = IMG_EMERALD_YELLOW }, { - EL_EMERALD_YELLOW, -1, GFX_ACTION_MOVING, + EL_EMERALD_YELLOW, -1, ACTION_MOVING, IMG_EMERALD_YELLOW_MOVING }, { - EL_EMERALD_YELLOW, -1, GFX_ACTION_FALLING, + EL_EMERALD_YELLOW, -1, ACTION_FALLING, IMG_EMERALD_YELLOW_FALLING }, { @@ -1441,11 +1441,11 @@ element_to_graphic[] = IMG_EMERALD_RED }, { - EL_EMERALD_RED, -1, GFX_ACTION_MOVING, + EL_EMERALD_RED, -1, ACTION_MOVING, IMG_EMERALD_RED_MOVING }, { - EL_EMERALD_RED, -1, GFX_ACTION_FALLING, + EL_EMERALD_RED, -1, ACTION_FALLING, IMG_EMERALD_RED_FALLING }, { @@ -1453,11 +1453,11 @@ element_to_graphic[] = IMG_EMERALD_PURPLE }, { - EL_EMERALD_PURPLE, -1, GFX_ACTION_MOVING, + EL_EMERALD_PURPLE, -1, ACTION_MOVING, IMG_EMERALD_PURPLE_MOVING }, { - EL_EMERALD_PURPLE, -1, GFX_ACTION_FALLING, + EL_EMERALD_PURPLE, -1, ACTION_FALLING, IMG_EMERALD_PURPLE_FALLING }, { @@ -1561,11 +1561,11 @@ element_to_graphic[] = IMG_PIG_DOWN }, { - EL_PIG, MV_DOWN, GFX_ACTION_MOVING, + EL_PIG, MV_DOWN, ACTION_MOVING, IMG_PIG_DOWN_MOVING }, { - EL_PIG, MV_DOWN, GFX_ACTION_EATING, + EL_PIG, MV_DOWN, ACTION_EATING, IMG_PIG_DOWN_EATING }, { @@ -1573,11 +1573,11 @@ element_to_graphic[] = IMG_PIG_UP }, { - EL_PIG, MV_UP, GFX_ACTION_MOVING, + EL_PIG, MV_UP, ACTION_MOVING, IMG_PIG_UP_MOVING }, { - EL_PIG, MV_UP, GFX_ACTION_EATING, + EL_PIG, MV_UP, ACTION_EATING, IMG_PIG_UP_EATING }, { @@ -1585,11 +1585,11 @@ element_to_graphic[] = IMG_PIG_LEFT }, { - EL_PIG, MV_LEFT, GFX_ACTION_MOVING, + EL_PIG, MV_LEFT, ACTION_MOVING, IMG_PIG_LEFT_MOVING }, { - EL_PIG, MV_LEFT, GFX_ACTION_EATING, + EL_PIG, MV_LEFT, ACTION_EATING, IMG_PIG_LEFT_EATING }, { @@ -1597,11 +1597,11 @@ element_to_graphic[] = IMG_PIG_RIGHT }, { - EL_PIG, MV_RIGHT, GFX_ACTION_MOVING, + EL_PIG, MV_RIGHT, ACTION_MOVING, IMG_PIG_RIGHT_MOVING }, { - EL_PIG, MV_RIGHT, GFX_ACTION_EATING, + EL_PIG, MV_RIGHT, ACTION_EATING, IMG_PIG_RIGHT_EATING }, { @@ -1613,11 +1613,11 @@ element_to_graphic[] = IMG_DRAGON_DOWN }, { - EL_DRAGON, MV_DOWN, GFX_ACTION_MOVING, + EL_DRAGON, MV_DOWN, ACTION_MOVING, IMG_DRAGON_DOWN_MOVING }, { - EL_DRAGON, MV_DOWN, GFX_ACTION_ATTACKING, + EL_DRAGON, MV_DOWN, ACTION_ATTACKING, IMG_DRAGON_DOWN_ATTACKING }, { @@ -1625,11 +1625,11 @@ element_to_graphic[] = IMG_DRAGON_UP }, { - EL_DRAGON, MV_UP, GFX_ACTION_MOVING, + EL_DRAGON, MV_UP, ACTION_MOVING, IMG_DRAGON_UP_MOVING }, { - EL_DRAGON, MV_UP, GFX_ACTION_ATTACKING, + EL_DRAGON, MV_UP, ACTION_ATTACKING, IMG_DRAGON_UP_ATTACKING }, { @@ -1637,11 +1637,11 @@ element_to_graphic[] = IMG_DRAGON_LEFT }, { - EL_DRAGON, MV_LEFT, GFX_ACTION_MOVING, + EL_DRAGON, MV_LEFT, ACTION_MOVING, IMG_DRAGON_LEFT_MOVING }, { - EL_DRAGON, MV_LEFT, GFX_ACTION_ATTACKING, + EL_DRAGON, MV_LEFT, ACTION_ATTACKING, IMG_DRAGON_LEFT_ATTACKING }, { @@ -1649,11 +1649,11 @@ element_to_graphic[] = IMG_DRAGON_RIGHT }, { - EL_DRAGON, MV_RIGHT, GFX_ACTION_MOVING, + EL_DRAGON, MV_RIGHT, ACTION_MOVING, IMG_DRAGON_RIGHT_MOVING }, { - EL_DRAGON, MV_RIGHT, GFX_ACTION_ATTACKING, + EL_DRAGON, MV_RIGHT, ACTION_ATTACKING, IMG_DRAGON_RIGHT_ATTACKING }, { @@ -1669,19 +1669,19 @@ element_to_graphic[] = IMG_MOLE_DOWN }, { - EL_MOLE_DOWN, -1, GFX_ACTION_MOVING, + EL_MOLE_DOWN, -1, ACTION_MOVING, IMG_MOLE_DOWN_MOVING }, { - EL_MOLE, MV_DOWN, GFX_ACTION_MOVING, + EL_MOLE, MV_DOWN, ACTION_MOVING, IMG_MOLE_DOWN_MOVING }, { - EL_MOLE_DOWN, -1, GFX_ACTION_DIGGING, + EL_MOLE_DOWN, -1, ACTION_DIGGING, IMG_MOLE_DOWN_DIGGING }, { - EL_MOLE, MV_DOWN, GFX_ACTION_DIGGING, + EL_MOLE, MV_DOWN, ACTION_DIGGING, IMG_MOLE_DOWN_DIGGING }, { @@ -1693,19 +1693,19 @@ element_to_graphic[] = IMG_MOLE_UP }, { - EL_MOLE_UP, -1, GFX_ACTION_MOVING, + EL_MOLE_UP, -1, ACTION_MOVING, IMG_MOLE_UP_MOVING }, { - EL_MOLE, MV_UP, GFX_ACTION_MOVING, + EL_MOLE, MV_UP, ACTION_MOVING, IMG_MOLE_UP_MOVING }, { - EL_MOLE_UP, -1, GFX_ACTION_DIGGING, + EL_MOLE_UP, -1, ACTION_DIGGING, IMG_MOLE_UP_DIGGING }, { - EL_MOLE, MV_UP, GFX_ACTION_DIGGING, + EL_MOLE, MV_UP, ACTION_DIGGING, IMG_MOLE_UP_DIGGING }, { @@ -1717,19 +1717,19 @@ element_to_graphic[] = IMG_MOLE_LEFT }, { - EL_MOLE_LEFT, -1, GFX_ACTION_MOVING, + EL_MOLE_LEFT, -1, ACTION_MOVING, IMG_MOLE_LEFT_MOVING }, { - EL_MOLE, MV_LEFT, GFX_ACTION_MOVING, + EL_MOLE, MV_LEFT, ACTION_MOVING, IMG_MOLE_LEFT_MOVING }, { - EL_MOLE_LEFT, -1, GFX_ACTION_DIGGING, + EL_MOLE_LEFT, -1, ACTION_DIGGING, IMG_MOLE_LEFT_DIGGING }, { - EL_MOLE, MV_LEFT, GFX_ACTION_DIGGING, + EL_MOLE, MV_LEFT, ACTION_DIGGING, IMG_MOLE_LEFT_DIGGING }, { @@ -1741,19 +1741,19 @@ element_to_graphic[] = IMG_MOLE_RIGHT }, { - EL_MOLE_RIGHT, -1, GFX_ACTION_MOVING, + EL_MOLE_RIGHT, -1, ACTION_MOVING, IMG_MOLE_RIGHT_MOVING }, { - EL_MOLE, MV_RIGHT, GFX_ACTION_MOVING, + EL_MOLE, MV_RIGHT, ACTION_MOVING, IMG_MOLE_RIGHT_MOVING }, { - EL_MOLE_RIGHT, -1, GFX_ACTION_DIGGING, + EL_MOLE_RIGHT, -1, ACTION_DIGGING, IMG_MOLE_RIGHT_DIGGING }, { - EL_MOLE, MV_RIGHT, GFX_ACTION_DIGGING, + EL_MOLE, MV_RIGHT, ACTION_DIGGING, IMG_MOLE_RIGHT_DIGGING }, { @@ -1765,7 +1765,7 @@ element_to_graphic[] = IMG_PENGUIN_DOWN }, { - EL_PENGUIN, MV_DOWN, GFX_ACTION_MOVING, + EL_PENGUIN, MV_DOWN, ACTION_MOVING, IMG_PENGUIN_DOWN_MOVING }, { @@ -1773,7 +1773,7 @@ element_to_graphic[] = IMG_PENGUIN_UP }, { - EL_PENGUIN, MV_UP, GFX_ACTION_MOVING, + EL_PENGUIN, MV_UP, ACTION_MOVING, IMG_PENGUIN_UP_MOVING }, { @@ -1781,7 +1781,7 @@ element_to_graphic[] = IMG_PENGUIN_LEFT }, { - EL_PENGUIN, MV_LEFT, GFX_ACTION_MOVING, + EL_PENGUIN, MV_LEFT, ACTION_MOVING, IMG_PENGUIN_LEFT_MOVING }, { @@ -1789,7 +1789,7 @@ element_to_graphic[] = IMG_PENGUIN_RIGHT }, { - EL_PENGUIN, MV_RIGHT, GFX_ACTION_MOVING, + EL_PENGUIN, MV_RIGHT, ACTION_MOVING, IMG_PENGUIN_RIGHT_MOVING }, { @@ -1797,7 +1797,7 @@ element_to_graphic[] = IMG_SATELLITE }, { - EL_SATELLITE, -1, GFX_ACTION_MOVING, + EL_SATELLITE, -1, ACTION_MOVING, IMG_SATELLITE_MOVING }, { @@ -1813,19 +1813,19 @@ element_to_graphic[] = IMG_PLAYER1_DOWN }, { - EL_PLAYER1, MV_DOWN, GFX_ACTION_MOVING, + EL_PLAYER1, MV_DOWN, ACTION_MOVING, IMG_PLAYER1_DOWN_MOVING }, { - EL_PLAYER1, MV_DOWN, GFX_ACTION_DIGGING, + EL_PLAYER1, MV_DOWN, ACTION_DIGGING, IMG_PLAYER1_DOWN_DIGGING }, { - EL_PLAYER1, MV_DOWN, GFX_ACTION_PUSHING, + EL_PLAYER1, MV_DOWN, ACTION_PUSHING, IMG_PLAYER1_DOWN_PUSHING }, { - EL_PLAYER1, MV_DOWN, GFX_ACTION_SNAPPING, + EL_PLAYER1, MV_DOWN, ACTION_SNAPPING, IMG_PLAYER1_DOWN_SNAPPING }, { @@ -1833,19 +1833,19 @@ element_to_graphic[] = IMG_PLAYER1_UP }, { - EL_PLAYER1, MV_UP, GFX_ACTION_MOVING, + EL_PLAYER1, MV_UP, ACTION_MOVING, IMG_PLAYER1_UP_MOVING }, { - EL_PLAYER1, MV_UP, GFX_ACTION_DIGGING, + EL_PLAYER1, MV_UP, ACTION_DIGGING, IMG_PLAYER1_UP_DIGGING }, { - EL_PLAYER1, MV_UP, GFX_ACTION_PUSHING, + EL_PLAYER1, MV_UP, ACTION_PUSHING, IMG_PLAYER1_UP_PUSHING }, { - EL_PLAYER1, MV_UP, GFX_ACTION_SNAPPING, + EL_PLAYER1, MV_UP, ACTION_SNAPPING, IMG_PLAYER1_UP_SNAPPING }, { @@ -1853,19 +1853,19 @@ element_to_graphic[] = IMG_PLAYER1_LEFT }, { - EL_PLAYER1, MV_LEFT, GFX_ACTION_MOVING, + EL_PLAYER1, MV_LEFT, ACTION_MOVING, IMG_PLAYER1_LEFT_MOVING }, { - EL_PLAYER1, MV_LEFT, GFX_ACTION_DIGGING, + EL_PLAYER1, MV_LEFT, ACTION_DIGGING, IMG_PLAYER1_LEFT_DIGGING }, { - EL_PLAYER1, MV_LEFT, GFX_ACTION_PUSHING, + EL_PLAYER1, MV_LEFT, ACTION_PUSHING, IMG_PLAYER1_LEFT_PUSHING }, { - EL_PLAYER1, MV_LEFT, GFX_ACTION_SNAPPING, + EL_PLAYER1, MV_LEFT, ACTION_SNAPPING, IMG_PLAYER1_LEFT_SNAPPING }, { @@ -1873,19 +1873,19 @@ element_to_graphic[] = IMG_PLAYER1_RIGHT }, { - EL_PLAYER1, MV_RIGHT, GFX_ACTION_MOVING, + EL_PLAYER1, MV_RIGHT, ACTION_MOVING, IMG_PLAYER1_RIGHT_MOVING }, { - EL_PLAYER1, MV_RIGHT, GFX_ACTION_DIGGING, + EL_PLAYER1, MV_RIGHT, ACTION_DIGGING, IMG_PLAYER1_RIGHT_DIGGING }, { - EL_PLAYER1, MV_RIGHT, GFX_ACTION_PUSHING, + EL_PLAYER1, MV_RIGHT, ACTION_PUSHING, IMG_PLAYER1_RIGHT_PUSHING }, { - EL_PLAYER1, MV_RIGHT, GFX_ACTION_SNAPPING, + EL_PLAYER1, MV_RIGHT, ACTION_SNAPPING, IMG_PLAYER1_RIGHT_SNAPPING }, { @@ -1897,19 +1897,19 @@ element_to_graphic[] = IMG_PLAYER2_DOWN }, { - EL_PLAYER2, MV_DOWN, GFX_ACTION_MOVING, + EL_PLAYER2, MV_DOWN, ACTION_MOVING, IMG_PLAYER2_DOWN_MOVING }, { - EL_PLAYER2, MV_DOWN, GFX_ACTION_DIGGING, + EL_PLAYER2, MV_DOWN, ACTION_DIGGING, IMG_PLAYER2_DOWN_DIGGING }, { - EL_PLAYER2, MV_DOWN, GFX_ACTION_PUSHING, + EL_PLAYER2, MV_DOWN, ACTION_PUSHING, IMG_PLAYER2_DOWN_PUSHING }, { - EL_PLAYER2, MV_DOWN, GFX_ACTION_SNAPPING, + EL_PLAYER2, MV_DOWN, ACTION_SNAPPING, IMG_PLAYER2_DOWN_SNAPPING }, { @@ -1917,19 +1917,19 @@ element_to_graphic[] = IMG_PLAYER2_UP }, { - EL_PLAYER2, MV_UP, GFX_ACTION_MOVING, + EL_PLAYER2, MV_UP, ACTION_MOVING, IMG_PLAYER2_UP_MOVING }, { - EL_PLAYER2, MV_UP, GFX_ACTION_DIGGING, + EL_PLAYER2, MV_UP, ACTION_DIGGING, IMG_PLAYER2_UP_DIGGING }, { - EL_PLAYER2, MV_UP, GFX_ACTION_PUSHING, + EL_PLAYER2, MV_UP, ACTION_PUSHING, IMG_PLAYER2_UP_PUSHING }, { - EL_PLAYER2, MV_UP, GFX_ACTION_SNAPPING, + EL_PLAYER2, MV_UP, ACTION_SNAPPING, IMG_PLAYER2_UP_SNAPPING }, { @@ -1937,19 +1937,19 @@ element_to_graphic[] = IMG_PLAYER2_LEFT }, { - EL_PLAYER2, MV_LEFT, GFX_ACTION_MOVING, + EL_PLAYER2, MV_LEFT, ACTION_MOVING, IMG_PLAYER2_LEFT_MOVING }, { - EL_PLAYER2, MV_LEFT, GFX_ACTION_DIGGING, + EL_PLAYER2, MV_LEFT, ACTION_DIGGING, IMG_PLAYER2_LEFT_DIGGING }, { - EL_PLAYER2, MV_LEFT, GFX_ACTION_PUSHING, + EL_PLAYER2, MV_LEFT, ACTION_PUSHING, IMG_PLAYER2_LEFT_PUSHING }, { - EL_PLAYER2, MV_LEFT, GFX_ACTION_SNAPPING, + EL_PLAYER2, MV_LEFT, ACTION_SNAPPING, IMG_PLAYER2_LEFT_SNAPPING }, { @@ -1957,19 +1957,19 @@ element_to_graphic[] = IMG_PLAYER2_RIGHT }, { - EL_PLAYER2, MV_RIGHT, GFX_ACTION_MOVING, + EL_PLAYER2, MV_RIGHT, ACTION_MOVING, IMG_PLAYER2_RIGHT_MOVING }, { - EL_PLAYER2, MV_RIGHT, GFX_ACTION_DIGGING, + EL_PLAYER2, MV_RIGHT, ACTION_DIGGING, IMG_PLAYER2_RIGHT_DIGGING }, { - EL_PLAYER2, MV_RIGHT, GFX_ACTION_PUSHING, + EL_PLAYER2, MV_RIGHT, ACTION_PUSHING, IMG_PLAYER2_RIGHT_PUSHING }, { - EL_PLAYER2, MV_RIGHT, GFX_ACTION_SNAPPING, + EL_PLAYER2, MV_RIGHT, ACTION_SNAPPING, IMG_PLAYER2_RIGHT_SNAPPING }, { @@ -1981,19 +1981,19 @@ element_to_graphic[] = IMG_PLAYER3_DOWN }, { - EL_PLAYER3, MV_DOWN, GFX_ACTION_MOVING, + EL_PLAYER3, MV_DOWN, ACTION_MOVING, IMG_PLAYER3_DOWN_MOVING }, { - EL_PLAYER3, MV_DOWN, GFX_ACTION_DIGGING, + EL_PLAYER3, MV_DOWN, ACTION_DIGGING, IMG_PLAYER3_DOWN_DIGGING }, { - EL_PLAYER3, MV_DOWN, GFX_ACTION_PUSHING, + EL_PLAYER3, MV_DOWN, ACTION_PUSHING, IMG_PLAYER3_DOWN_PUSHING }, { - EL_PLAYER3, MV_DOWN, GFX_ACTION_SNAPPING, + EL_PLAYER3, MV_DOWN, ACTION_SNAPPING, IMG_PLAYER3_DOWN_SNAPPING }, { @@ -2001,19 +2001,19 @@ element_to_graphic[] = IMG_PLAYER3_UP }, { - EL_PLAYER3, MV_UP, GFX_ACTION_MOVING, + EL_PLAYER3, MV_UP, ACTION_MOVING, IMG_PLAYER3_UP_MOVING }, { - EL_PLAYER3, MV_UP, GFX_ACTION_DIGGING, + EL_PLAYER3, MV_UP, ACTION_DIGGING, IMG_PLAYER3_UP_DIGGING }, { - EL_PLAYER3, MV_UP, GFX_ACTION_PUSHING, + EL_PLAYER3, MV_UP, ACTION_PUSHING, IMG_PLAYER3_UP_PUSHING }, { - EL_PLAYER3, MV_UP, GFX_ACTION_SNAPPING, + EL_PLAYER3, MV_UP, ACTION_SNAPPING, IMG_PLAYER3_UP_SNAPPING }, { @@ -2021,19 +2021,19 @@ element_to_graphic[] = IMG_PLAYER3_LEFT }, { - EL_PLAYER3, MV_LEFT, GFX_ACTION_MOVING, + EL_PLAYER3, MV_LEFT, ACTION_MOVING, IMG_PLAYER3_LEFT_MOVING }, { - EL_PLAYER3, MV_LEFT, GFX_ACTION_DIGGING, + EL_PLAYER3, MV_LEFT, ACTION_DIGGING, IMG_PLAYER3_LEFT_DIGGING }, { - EL_PLAYER3, MV_LEFT, GFX_ACTION_PUSHING, + EL_PLAYER3, MV_LEFT, ACTION_PUSHING, IMG_PLAYER3_LEFT_PUSHING }, { - EL_PLAYER3, MV_LEFT, GFX_ACTION_SNAPPING, + EL_PLAYER3, MV_LEFT, ACTION_SNAPPING, IMG_PLAYER3_LEFT_SNAPPING }, { @@ -2041,19 +2041,19 @@ element_to_graphic[] = IMG_PLAYER3_RIGHT }, { - EL_PLAYER3, MV_RIGHT, GFX_ACTION_MOVING, + EL_PLAYER3, MV_RIGHT, ACTION_MOVING, IMG_PLAYER3_RIGHT_MOVING }, { - EL_PLAYER3, MV_RIGHT, GFX_ACTION_DIGGING, + EL_PLAYER3, MV_RIGHT, ACTION_DIGGING, IMG_PLAYER3_RIGHT_DIGGING }, { - EL_PLAYER3, MV_RIGHT, GFX_ACTION_PUSHING, + EL_PLAYER3, MV_RIGHT, ACTION_PUSHING, IMG_PLAYER3_RIGHT_PUSHING }, { - EL_PLAYER3, MV_RIGHT, GFX_ACTION_SNAPPING, + EL_PLAYER3, MV_RIGHT, ACTION_SNAPPING, IMG_PLAYER3_RIGHT_SNAPPING }, { @@ -2065,19 +2065,19 @@ element_to_graphic[] = IMG_PLAYER4_DOWN }, { - EL_PLAYER4, MV_DOWN, GFX_ACTION_MOVING, + EL_PLAYER4, MV_DOWN, ACTION_MOVING, IMG_PLAYER4_DOWN_MOVING }, { - EL_PLAYER4, MV_DOWN, GFX_ACTION_DIGGING, + EL_PLAYER4, MV_DOWN, ACTION_DIGGING, IMG_PLAYER4_DOWN_DIGGING }, { - EL_PLAYER4, MV_DOWN, GFX_ACTION_PUSHING, + EL_PLAYER4, MV_DOWN, ACTION_PUSHING, IMG_PLAYER4_DOWN_PUSHING }, { - EL_PLAYER4, MV_DOWN, GFX_ACTION_SNAPPING, + EL_PLAYER4, MV_DOWN, ACTION_SNAPPING, IMG_PLAYER4_DOWN_SNAPPING }, { @@ -2085,19 +2085,19 @@ element_to_graphic[] = IMG_PLAYER4_UP }, { - EL_PLAYER4, MV_UP, GFX_ACTION_MOVING, + EL_PLAYER4, MV_UP, ACTION_MOVING, IMG_PLAYER4_UP_MOVING }, { - EL_PLAYER4, MV_UP, GFX_ACTION_DIGGING, + EL_PLAYER4, MV_UP, ACTION_DIGGING, IMG_PLAYER4_UP_DIGGING }, { - EL_PLAYER4, MV_UP, GFX_ACTION_PUSHING, + EL_PLAYER4, MV_UP, ACTION_PUSHING, IMG_PLAYER4_UP_PUSHING }, { - EL_PLAYER4, MV_UP, GFX_ACTION_SNAPPING, + EL_PLAYER4, MV_UP, ACTION_SNAPPING, IMG_PLAYER4_UP_SNAPPING }, { @@ -2105,19 +2105,19 @@ element_to_graphic[] = IMG_PLAYER4_LEFT }, { - EL_PLAYER4, MV_LEFT, GFX_ACTION_MOVING, + EL_PLAYER4, MV_LEFT, ACTION_MOVING, IMG_PLAYER4_LEFT_MOVING }, { - EL_PLAYER4, MV_LEFT, GFX_ACTION_DIGGING, + EL_PLAYER4, MV_LEFT, ACTION_DIGGING, IMG_PLAYER4_LEFT_DIGGING }, { - EL_PLAYER4, MV_LEFT, GFX_ACTION_PUSHING, + EL_PLAYER4, MV_LEFT, ACTION_PUSHING, IMG_PLAYER4_LEFT_PUSHING }, { - EL_PLAYER4, MV_LEFT, GFX_ACTION_SNAPPING, + EL_PLAYER4, MV_LEFT, ACTION_SNAPPING, IMG_PLAYER4_LEFT_SNAPPING }, { @@ -2125,19 +2125,19 @@ element_to_graphic[] = IMG_PLAYER4_RIGHT }, { - EL_PLAYER4, MV_RIGHT, GFX_ACTION_MOVING, + EL_PLAYER4, MV_RIGHT, ACTION_MOVING, IMG_PLAYER4_RIGHT_MOVING }, { - EL_PLAYER4, MV_RIGHT, GFX_ACTION_DIGGING, + EL_PLAYER4, MV_RIGHT, ACTION_DIGGING, IMG_PLAYER4_RIGHT_DIGGING }, { - EL_PLAYER4, MV_RIGHT, GFX_ACTION_PUSHING, + EL_PLAYER4, MV_RIGHT, ACTION_PUSHING, IMG_PLAYER4_RIGHT_PUSHING }, { - EL_PLAYER4, MV_RIGHT, GFX_ACTION_SNAPPING, + EL_PLAYER4, MV_RIGHT, ACTION_SNAPPING, IMG_PLAYER4_RIGHT_SNAPPING }, { diff --git a/src/conftime.h b/src/conftime.h index 75512089..15646aa6 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-01-18 12:46]" +#define COMPILE_DATE_STRING "[2003-01-18 13:34]" diff --git a/src/game.c b/src/game.c index 1118258c..46a99c8f 100644 --- a/src/game.c +++ b/src/game.c @@ -122,19 +122,6 @@ static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS]; /* sound definitions */ /* ------------------------------------------------------------------------- */ -#define SND_ACTION_UNKNOWN 0 -#define SND_ACTION_WAITING 1 -#define SND_ACTION_MOVING 2 -#define SND_ACTION_DIGGING 3 -#define SND_ACTION_COLLECTING 4 -#define SND_ACTION_PASSING 5 -#define SND_ACTION_IMPACT 6 -#define SND_ACTION_PUSHING 7 -#define SND_ACTION_ACTIVATING 8 -#define SND_ACTION_ACTIVE 9 - -#define NUM_SND_ACTIONS 10 - static struct { char *text; @@ -143,23 +130,23 @@ static struct } sound_action_properties[] = { /* insert _all_ loop sound actions here */ - { ".waiting", SND_ACTION_WAITING, TRUE }, - { ".moving", SND_ACTION_MOVING, TRUE }, /* continuos moving */ - { ".active", SND_ACTION_ACTIVE, TRUE }, - { ".growing", SND_ACTION_UNKNOWN, TRUE }, - { ".attacking", SND_ACTION_UNKNOWN, TRUE }, + { ".waiting", ACTION_WAITING, TRUE }, + { ".moving", ACTION_MOVING, TRUE }, /* continuos moving */ + { ".active", ACTION_ACTIVE, TRUE }, + { ".growing", ACTION_GROWING, TRUE }, + { ".attacking", ACTION_ATTACKING, TRUE }, /* other (non-loop) sound actions are optional */ - { ".stepping", SND_ACTION_MOVING, FALSE }, /* discrete moving */ - { ".digging", SND_ACTION_DIGGING, FALSE }, - { ".collecting", SND_ACTION_COLLECTING, FALSE }, - { ".passing", SND_ACTION_PASSING, FALSE }, - { ".impact", SND_ACTION_IMPACT, FALSE }, - { ".pushing", SND_ACTION_PUSHING, FALSE }, - { ".activating", SND_ACTION_ACTIVATING, FALSE }, + { ".stepping", ACTION_MOVING, FALSE }, /* discrete moving */ + { ".digging", ACTION_DIGGING, FALSE }, + { ".collecting", ACTION_COLLECTING, FALSE }, + { ".passing", ACTION_PASSING, FALSE }, + { ".impact", ACTION_IMPACT, FALSE }, + { ".pushing", ACTION_PUSHING, FALSE }, + { ".activating", ACTION_ACTIVATING, FALSE }, { NULL, 0, 0 }, }; -static int element_action_sound[MAX_NUM_ELEMENTS][NUM_SND_ACTIONS]; +static int element_action_sound[MAX_NUM_ELEMENTS][NUM_ACTIONS]; static boolean is_loop_sound[NUM_SOUND_FILES]; #define IS_LOOP_SOUND(x) (is_loop_sound[x]) @@ -597,14 +584,14 @@ void InitGameSound() /* initialize sound effect for all elements to "no sound" */ for (i=0; igems_still_needed, 3), FS_SMALL, FC_YELLOW); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING); + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); break; case EL_SPEED_PILL: @@ -6434,7 +6421,7 @@ int DigField(struct PlayerInfo *player, DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING); + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); break; case EL_DYNABOMB_NR: @@ -6656,7 +6643,7 @@ int DigField(struct PlayerInfo *player, player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8)); DrawLevelField(x + dx, y + dy); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING); + PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); break; case EL_GATE1: @@ -6716,7 +6703,7 @@ int DigField(struct PlayerInfo *player, player->programmed_action = move_direction; DOUBLE_PLAYER_SPEED(player); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PASSING); + PlaySoundLevelElementAction(x, y, element, ACTION_PASSING); break; case EL_SP_PORT1_LEFT: @@ -6914,7 +6901,7 @@ int DigField(struct PlayerInfo *player, { RemoveField(x, y); Feld[x+dx][y+dy] = element; - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING); + PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); } player->push_delay_value = (element == EL_BALLOON ? 0 : 2); diff --git a/src/init.c b/src/init.c index b720f576..b65b6719 100644 --- a/src/init.c +++ b/src/init.c @@ -692,21 +692,21 @@ void InitElementInfo() /* set values to -1 to identify later as "uninitialized" values */ for (i=0; i -1) { @@ -735,24 +735,24 @@ void InitElementInfo() /* now set all '-1' values to element specific default values */ for (i=0; iidentifier, num_levels_solved, num_levels_played, - num_levels_solved * 100 / num_levels_played); + (num_levels_played ? num_levels_solved * 100 / num_levels_played :0)); if (num_levels_played != num_levels_solved) { printf(", FAILED:"); diff --git a/src/tools.c b/src/tools.c index c61cc5a3..f80b7574 100644 --- a/src/tools.c +++ b/src/tools.c @@ -742,7 +742,7 @@ void DrawPlayer(struct PlayerInfo *player) if ((sxx || syy) && IS_PUSHABLE(element)) { - graphic = el_dir_act2img(element, player->MovDir, GFX_ACTION_MOVING); + graphic = el_dir_act2img(element, player->MovDir, ACTION_MOVING); #if 1 frame = getGraphicAnimationFrame(graphic, player->GfxPos); @@ -1140,13 +1140,13 @@ inline static int getFramePosition(int x, int y) inline static int getGfxAction(int x, int y) { - int gfx_action = GFX_ACTION_DEFAULT; + int gfx_action = ACTION_DEFAULT; #if 0 - if (GfxAction[x][y] != GFX_ACTION_DEFAULT) + if (GfxAction[x][y] != ACTION_DEFAULT) gfx_action = GfxAction[x][y]; else if (IS_MOVING(x, y)) - gfx_action = GFX_ACTION_MOVING; + gfx_action = ACTION_MOVING; #else gfx_action = GfxAction[x][y]; #endif @@ -2480,7 +2480,7 @@ int get_next_element(int element) int el2img(int element) { - int graphic = element_info[element].graphic[GFX_ACTION_DEFAULT]; + int graphic = element_info[element].graphic[ACTION_DEFAULT]; #if DEBUG if (graphic < 0) @@ -2493,7 +2493,7 @@ int el2img(int element) int el_dir2img(int element, int direction) { - return el_dir_act2img(element, direction, GFX_ACTION_DEFAULT); + return el_dir_act2img(element, direction, ACTION_DEFAULT); } int el_dir_act2img(int element, int direction, int action) -- 2.34.1