X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=c2e69b87e351f5a6487a7daabfcedc2355d4c6b3;hb=1290799ac0be42dc5db602dd113c5185df0a7e03;hp=cef28a3003695c33e83727c29f0e865fe26d322a;hpb=727c32da2353e1f688c4636b86a1ab6e8a71f8d6;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index cef28a30..c2e69b87 100644 --- a/src/init.c +++ b/src/init.c @@ -29,15 +29,17 @@ static char *image_filename[NUM_PICTURES] = { "RocksScreen.pcx", + "RocksElements.pcx", "RocksDoor.pcx", "RocksHeroes.pcx", "RocksToons.pcx", "RocksSP.pcx", "RocksDC.pcx", "RocksMore.pcx", - "RocksFont.pcx", - "RocksFont2.pcx", - "RocksFont3.pcx" + "RocksFontBig.pcx", + "RocksFontSmall.pcx", + "RocksFontMedium.pcx", + "RocksFontEM.pcx" }; static void InitSetup(void); @@ -55,6 +57,7 @@ static void InitGadgets(void); static void InitElementProperties(void); static void InitElementInfo(void); static void InitGraphicInfo(void); +static void InitSoundInfo(); static void Execute_Debug_Command(char *); void OpenAll(void) @@ -175,17 +178,19 @@ void InitNetworkServer() static void InitImages() { - InitImageList(image_config, NUM_IMAGE_CONFIG_ENTRIES); + InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES); /* load custom images */ ReloadCustomImages(); + InitGraphicInfo(); } static void InitMixer() { OpenAudio(); - InitSoundList(sound_config, NUM_SOUND_CONFIG_ENTRIES); + + InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES); StartMixer(); } @@ -196,8 +201,7 @@ static void InitSound() InitReloadSounds(artwork.snd_current->identifier); InitReloadMusic(artwork.mus_current->identifier); - /* initialize sound effect lookup table for element actions */ - InitGameSound(); + InitSoundInfo(); } static void InitTileClipmasks() @@ -379,9 +383,9 @@ void InitGfx() pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); - pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]); + pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]); - InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]); + InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL); DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW); DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED); @@ -390,7 +394,7 @@ void InitGfx() for(i=0; i -1) + { + int element = element_to_direction_graphic[i].element; + + element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_LEFT] = + element_to_direction_graphic[i].graphic_left; + element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_RIGHT] = + element_to_direction_graphic[i].graphic_right; + element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_UP] = + element_to_direction_graphic[i].graphic_up; + element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_DOWN] = + element_to_direction_graphic[i].graphic_down; + + element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE; i++; } } -void InitGraphicInfo() +static void InitGraphicInfo() { int i; - /* always start with reliable default values */ + image_files = getCurrentImageList(); + for(i=0; i %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]); + printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]); + + graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK].src_x = 0; + graphic_info[GFX_ABLENK].src_y = 0; + + graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX; + graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX; + graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX; + graphic_info[GFX_ABLENK + 1].src_y = 0; + graphic_info[GFX_ABLENK + 2].src_y = 0; + graphic_info[GFX_ABLENK + 3].src_y = 0; +#endif +} + +static void InitSoundInfo() +{ + sound_files = getCurrentSoundList(); + + /* initialize sound effect lookup table for element actions */ + InitGameSound(); } void InitElementProperties() @@ -874,54 +1059,54 @@ void InitElementProperties() static int ep_amoebalive[] = { - EL_AMOEBE_NASS, - EL_AMOEBE_NORM, - EL_AMOEBE_VOLL, - EL_AMOEBE_BD + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA }; static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive); static int ep_amoeboid[] = { - EL_AMOEBE_TOT, - EL_AMOEBE_NASS, - EL_AMOEBE_NORM, - EL_AMOEBE_VOLL, - EL_AMOEBE_BD + EL_AMOEBA_DEAD, + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA }; static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid); static int ep_schluessel[] = { - EL_SCHLUESSEL1, - EL_SCHLUESSEL2, - EL_SCHLUESSEL3, - EL_SCHLUESSEL4, - EL_EM_KEY_1, - EL_EM_KEY_2, - EL_EM_KEY_3, - EL_EM_KEY_4 + EL_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, + EL_EM_KEY1, + EL_EM_KEY2, + EL_EM_KEY3, + EL_EM_KEY4 }; static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel); static int ep_pforte[] = { - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, EL_SWITCHGATE_OPEN, EL_SWITCHGATE_OPENING, EL_SWITCHGATE_CLOSED, @@ -930,13 +1115,13 @@ void InitElementProperties() EL_TIMEGATE_OPENING, EL_TIMEGATE_CLOSED, EL_TIMEGATE_CLOSING, - EL_TUBE_CROSS, + EL_TUBE_ALL, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, - EL_TUBE_VERT_LEFT, - EL_TUBE_VERT_RIGHT, - EL_TUBE_HORIZ_UP, - EL_TUBE_HORIZ_DOWN, + EL_TUBE_VERTICAL_LEFT, + EL_TUBE_VERTICAL_RIGHT, + EL_TUBE_HORIZONTAL_UP, + EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_UP, EL_TUBE_LEFT_DOWN, EL_TUBE_RIGHT_UP, @@ -946,45 +1131,45 @@ void InitElementProperties() static int ep_solid[] = { - EL_BETON, - EL_MAUERWERK, - EL_MAUER_LEBT, - EL_MAUER_X, - EL_MAUER_Y, - EL_MAUER_XY, + EL_STEELWALL, + EL_WALL, + EL_WALL_GROWING, + EL_WALL_GROWING_X, + EL_WALL_GROWING_Y, + EL_WALL_GROWING_XY, EL_BD_WALL, - EL_FELSBODEN, - EL_AUSGANG_ZU, - EL_AUSGANG_ACT, - EL_AUSGANG_AUF, - EL_AMOEBE_TOT, - EL_AMOEBE_NASS, - EL_AMOEBE_NORM, - EL_AMOEBE_VOLL, - EL_AMOEBE_BD, - EL_MORAST_VOLL, - EL_MORAST_LEER, + EL_WALL_CRUMBLED, + EL_EXIT_CLOSED, + EL_EXIT_OPENING, + EL_EXIT_OPEN, + EL_AMOEBA_DEAD, + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA, + EL_QUICKSAND_FULL, + EL_QUICKSAND_EMPTY, EL_QUICKSAND_FILLING, EL_QUICKSAND_EMPTYING, - EL_MAGIC_WALL_OFF, - EL_MAGIC_WALL_EMPTY, + EL_MAGIC_WALL, + EL_MAGIC_WALL_ACTIVE, EL_MAGIC_WALL_EMPTYING, EL_MAGIC_WALL_FILLING, EL_MAGIC_WALL_FULL, EL_MAGIC_WALL_DEAD, - EL_MAGIC_WALL_BD_OFF, - EL_MAGIC_WALL_BD_EMPTY, - EL_MAGIC_WALL_BD_EMPTYING, - EL_MAGIC_WALL_BD_FULL, - EL_MAGIC_WALL_BD_FILLING, - EL_MAGIC_WALL_BD_DEAD, - EL_LIFE, - EL_LIFE_ASYNC, - EL_BADEWANNE1, - EL_BADEWANNE2, - EL_BADEWANNE3, - EL_BADEWANNE4, - EL_BADEWANNE5, + EL_BD_MAGIC_WALL, + EL_BD_MAGIC_WALL_ACTIVE, + EL_BD_MAGIC_WALL_EMPTYING, + EL_BD_MAGIC_WALL_FULL, + EL_BD_MAGIC_WALL_FILLING, + EL_BD_MAGIC_WALL_DEAD, + EL_GAMEOFLIFE, + EL_BIOMAZE, + EL_ACIDPOOL_TOPLEFT, + EL_ACIDPOOL_TOPRIGHT, + EL_ACIDPOOL_BOTTOMLEFT, + EL_ACIDPOOL_BOTTOM, + EL_ACIDPOOL_BOTTOMRIGHT, EL_SP_CHIP_SINGLE, EL_SP_CHIP_LEFT, EL_SP_CHIP_RIGHT, @@ -1003,26 +1188,27 @@ void InitElementProperties() EL_SP_HARD_BASE6, EL_SP_TERMINAL, EL_SP_TERMINAL_ACTIVE, - EL_SP_EXIT, - EL_INVISIBLE_STEEL, - EL_BELT1_SWITCH_LEFT, - EL_BELT1_SWITCH_MIDDLE, - EL_BELT1_SWITCH_RIGHT, - EL_BELT2_SWITCH_LEFT, - EL_BELT2_SWITCH_MIDDLE, - EL_BELT2_SWITCH_RIGHT, - EL_BELT3_SWITCH_LEFT, - EL_BELT3_SWITCH_MIDDLE, - EL_BELT3_SWITCH_RIGHT, - EL_BELT4_SWITCH_LEFT, - EL_BELT4_SWITCH_MIDDLE, - EL_BELT4_SWITCH_RIGHT, - EL_SWITCHGATE_SWITCH_1, - EL_SWITCHGATE_SWITCH_2, - EL_LIGHT_SWITCH_OFF, - EL_LIGHT_SWITCH_ON, - EL_TIMEGATE_SWITCH_OFF, - EL_TIMEGATE_SWITCH_ON, + EL_SP_EXIT_CLOSED, + EL_SP_EXIT_OPEN, + EL_INVISIBLE_STEELWALL, + EL_CONVEYOR_BELT1_SWITCH_LEFT, + EL_CONVEYOR_BELT1_SWITCH_MIDDLE, + EL_CONVEYOR_BELT1_SWITCH_RIGHT, + EL_CONVEYOR_BELT2_SWITCH_LEFT, + EL_CONVEYOR_BELT2_SWITCH_MIDDLE, + EL_CONVEYOR_BELT2_SWITCH_RIGHT, + EL_CONVEYOR_BELT3_SWITCH_LEFT, + EL_CONVEYOR_BELT3_SWITCH_MIDDLE, + EL_CONVEYOR_BELT3_SWITCH_RIGHT, + EL_CONVEYOR_BELT4_SWITCH_LEFT, + EL_CONVEYOR_BELT4_SWITCH_MIDDLE, + EL_CONVEYOR_BELT4_SWITCH_RIGHT, + EL_SWITCHGATE_SWITCH_UP, + EL_SWITCHGATE_SWITCH_DOWN, + EL_LIGHT_SWITCH, + EL_LIGHT_SWITCH_ACTIVE, + EL_TIMEGATE_SWITCH, + EL_TIMEGATE_SWITCH_ACTIVE, EL_SIGN_EXCLAMATION, EL_SIGN_RADIOACTIVITY, EL_SIGN_STOP, @@ -1035,38 +1221,38 @@ void InitElementProperties() EL_SIGN_EXIT, EL_SIGN_YINYANG, EL_SIGN_OTHER, - EL_STEEL_SLANTED, - EL_EMC_STEEL_WALL_1, - EL_EMC_STEEL_WALL_2, - EL_EMC_STEEL_WALL_3, - EL_EMC_STEEL_WALL_4, - EL_EMC_WALL_1, - EL_EMC_WALL_2, - EL_EMC_WALL_3, - EL_EMC_WALL_4, - EL_EMC_WALL_5, - EL_EMC_WALL_6, - EL_EMC_WALL_7, - EL_EMC_WALL_8, + EL_STEELWALL_SLANTED, + EL_EMC_STEELWALL1, + EL_EMC_STEELWALL2, + EL_EMC_STEELWALL3, + EL_EMC_STEELWALL4, + EL_EMC_WALL_PILLAR_UPPER, + EL_EMC_WALL_PILLAR_MIDDLE, + EL_EMC_WALL_PILLAR_LOWER, + EL_EMC_WALL4, + EL_EMC_WALL5, + EL_EMC_WALL6, + EL_EMC_WALL7, + EL_EMC_WALL8, EL_CRYSTAL, EL_WALL_PEARL, EL_WALL_CRYSTAL, - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, EL_SWITCHGATE_OPEN, EL_SWITCHGATE_OPENING, EL_SWITCHGATE_CLOSED, @@ -1075,13 +1261,13 @@ void InitElementProperties() EL_TIMEGATE_OPENING, EL_TIMEGATE_CLOSED, EL_TIMEGATE_CLOSING, - EL_TUBE_CROSS, + EL_TUBE_ALL, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, - EL_TUBE_VERT_LEFT, - EL_TUBE_VERT_RIGHT, - EL_TUBE_HORIZ_UP, - EL_TUBE_HORIZ_DOWN, + EL_TUBE_VERTICAL_LEFT, + EL_TUBE_VERTICAL_RIGHT, + EL_TUBE_HORIZONTAL_UP, + EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_UP, EL_TUBE_LEFT_DOWN, EL_TUBE_RIGHT_UP, @@ -1091,13 +1277,13 @@ void InitElementProperties() static int ep_massive[] = { - EL_BETON, - EL_SALZSAEURE, - EL_BADEWANNE1, - EL_BADEWANNE2, - EL_BADEWANNE3, - EL_BADEWANNE4, - EL_BADEWANNE5, + EL_STEELWALL, + EL_ACID, + EL_ACIDPOOL_TOPLEFT, + EL_ACIDPOOL_TOPRIGHT, + EL_ACIDPOOL_BOTTOMLEFT, + EL_ACIDPOOL_BOTTOM, + EL_ACIDPOOL_BOTTOMRIGHT, EL_SP_HARD_GRAY, EL_SP_HARD_GREEN, EL_SP_HARD_BLUE, @@ -1109,21 +1295,21 @@ void InitElementProperties() EL_SP_HARD_BASE4, EL_SP_HARD_BASE5, EL_SP_HARD_BASE6, - EL_INVISIBLE_STEEL, - EL_BELT1_SWITCH_LEFT, - EL_BELT1_SWITCH_MIDDLE, - EL_BELT1_SWITCH_RIGHT, - EL_BELT2_SWITCH_LEFT, - EL_BELT2_SWITCH_MIDDLE, - EL_BELT2_SWITCH_RIGHT, - EL_BELT3_SWITCH_LEFT, - EL_BELT3_SWITCH_MIDDLE, - EL_BELT3_SWITCH_RIGHT, - EL_BELT4_SWITCH_LEFT, - EL_BELT4_SWITCH_MIDDLE, - EL_BELT4_SWITCH_RIGHT, - EL_LIGHT_SWITCH_OFF, - EL_LIGHT_SWITCH_ON, + EL_INVISIBLE_STEELWALL, + EL_CONVEYOR_BELT1_SWITCH_LEFT, + EL_CONVEYOR_BELT1_SWITCH_MIDDLE, + EL_CONVEYOR_BELT1_SWITCH_RIGHT, + EL_CONVEYOR_BELT2_SWITCH_LEFT, + EL_CONVEYOR_BELT2_SWITCH_MIDDLE, + EL_CONVEYOR_BELT2_SWITCH_RIGHT, + EL_CONVEYOR_BELT3_SWITCH_LEFT, + EL_CONVEYOR_BELT3_SWITCH_MIDDLE, + EL_CONVEYOR_BELT3_SWITCH_RIGHT, + EL_CONVEYOR_BELT4_SWITCH_LEFT, + EL_CONVEYOR_BELT4_SWITCH_MIDDLE, + EL_CONVEYOR_BELT4_SWITCH_RIGHT, + EL_LIGHT_SWITCH, + EL_LIGHT_SWITCH_ACTIVE, EL_SIGN_EXCLAMATION, EL_SIGN_RADIOACTIVITY, EL_SIGN_STOP, @@ -1136,28 +1322,28 @@ void InitElementProperties() EL_SIGN_EXIT, EL_SIGN_YINYANG, EL_SIGN_OTHER, - EL_STEEL_SLANTED, - EL_EMC_STEEL_WALL_1, - EL_EMC_STEEL_WALL_2, - EL_EMC_STEEL_WALL_3, - EL_EMC_STEEL_WALL_4, + EL_STEELWALL_SLANTED, + EL_EMC_STEELWALL1, + EL_EMC_STEELWALL2, + EL_EMC_STEELWALL3, + EL_EMC_STEELWALL4, EL_CRYSTAL, - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, EL_SWITCHGATE_OPEN, EL_SWITCHGATE_OPENING, EL_SWITCHGATE_CLOSED, @@ -1166,13 +1352,13 @@ void InitElementProperties() EL_TIMEGATE_OPENING, EL_TIMEGATE_CLOSED, EL_TIMEGATE_CLOSING, - EL_TUBE_CROSS, + EL_TUBE_ALL, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, - EL_TUBE_VERT_LEFT, - EL_TUBE_VERT_RIGHT, - EL_TUBE_HORIZ_UP, - EL_TUBE_HORIZ_DOWN, + EL_TUBE_VERTICAL_LEFT, + EL_TUBE_VERTICAL_RIGHT, + EL_TUBE_HORIZONTAL_UP, + EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_UP, EL_TUBE_LEFT_DOWN, EL_TUBE_RIGHT_UP, @@ -1182,27 +1368,27 @@ void InitElementProperties() static int ep_slippery[] = { - EL_FELSBODEN, + EL_WALL_CRUMBLED, EL_BD_WALL, - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_BOMBE, - EL_KOKOSNUSS, - EL_ABLENK_EIN, - EL_ABLENK_AUS, - EL_ZEIT_VOLL, - EL_ZEIT_LEER, - EL_BIRNE_EIN, - EL_BIRNE_AUS, - EL_BADEWANNE1, - EL_BADEWANNE2, - EL_SONDE, + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND, + EL_BOMB, + EL_NUT, + EL_ROBOT_WHEEL_ACTIVE, + EL_ROBOT_WHEEL, + EL_TIME_ORB_FULL, + EL_TIME_ORB_EMPTY, + EL_LAMP_ACTIVE, + EL_LAMP, + EL_ACIDPOOL_TOPLEFT, + EL_ACIDPOOL_TOPRIGHT, + EL_SATELLITE, EL_SP_ZONK, EL_SP_INFOTRON, EL_SP_CHIP_SINGLE, @@ -1211,7 +1397,7 @@ void InitElementProperties() EL_SP_CHIP_UPPER, EL_SP_CHIP_LOWER, EL_SPEED_PILL, - EL_STEEL_SLANTED, + EL_STEELWALL_SLANTED, EL_PEARL, EL_CRYSTAL }; @@ -1219,12 +1405,12 @@ void InitElementProperties() static int ep_enemy[] = { - EL_KAEFER, - EL_FLIEGER, - EL_BUTTERFLY, - EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + EL_BUG, + EL_SPACESHIP, + EL_BD_BUTTERFLY, + EL_BD_FIREFLY, + EL_YAMYAM, + EL_DARK_YAMYAM, EL_ROBOT, EL_PACMAN, EL_SP_SNIKSNAK, @@ -1234,33 +1420,33 @@ void InitElementProperties() static int ep_mauer[] = { - EL_BETON, - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, - EL_AUSGANG_ZU, - EL_AUSGANG_ACT, - EL_AUSGANG_AUF, - EL_MAUERWERK, - EL_FELSBODEN, - EL_MAUER_LEBT, - EL_MAUER_X, - EL_MAUER_Y, - EL_MAUER_XY, - EL_MAUERND, + EL_STEELWALL, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, + EL_EXIT_CLOSED, + EL_EXIT_OPENING, + EL_EXIT_OPEN, + EL_WALL, + EL_WALL_CRUMBLED, + EL_WALL_GROWING, + EL_WALL_GROWING_X, + EL_WALL_GROWING_Y, + EL_WALL_GROWING_XY, + EL_WALL_GROWING_ACTIVE, EL_BD_WALL, EL_SP_CHIP_SINGLE, EL_SP_CHIP_LEFT, @@ -1280,42 +1466,43 @@ void InitElementProperties() EL_SP_HARD_BASE6, EL_SP_TERMINAL, EL_SP_TERMINAL_ACTIVE, - EL_SP_EXIT, - EL_INVISIBLE_STEEL, - EL_STEEL_SLANTED, - EL_EMC_STEEL_WALL_1, - EL_EMC_STEEL_WALL_2, - EL_EMC_STEEL_WALL_3, - EL_EMC_STEEL_WALL_4, - EL_EMC_WALL_1, - EL_EMC_WALL_2, - EL_EMC_WALL_3, - EL_EMC_WALL_4, - EL_EMC_WALL_5, - EL_EMC_WALL_6, - EL_EMC_WALL_7, - EL_EMC_WALL_8 + EL_SP_EXIT_CLOSED, + EL_SP_EXIT_OPEN, + EL_INVISIBLE_STEELWALL, + EL_STEELWALL_SLANTED, + EL_EMC_STEELWALL1, + EL_EMC_STEELWALL2, + EL_EMC_STEELWALL3, + EL_EMC_STEELWALL4, + EL_EMC_WALL_PILLAR_UPPER, + EL_EMC_WALL_PILLAR_MIDDLE, + EL_EMC_WALL_PILLAR_LOWER, + EL_EMC_WALL4, + EL_EMC_WALL5, + EL_EMC_WALL6, + EL_EMC_WALL7, + EL_EMC_WALL8 }; static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer); static int ep_can_fall[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_BOMBE, - EL_KOKOSNUSS, - EL_TROPFEN, - EL_MORAST_VOLL, + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND, + EL_BOMB, + EL_NUT, + EL_AMOEBA_DROP, + EL_QUICKSAND_FULL, EL_MAGIC_WALL_FULL, - EL_MAGIC_WALL_BD_FULL, - EL_ZEIT_VOLL, - EL_ZEIT_LEER, + EL_BD_MAGIC_WALL_FULL, + EL_TIME_ORB_FULL, + EL_TIME_ORB_EMPTY, EL_SP_ZONK, EL_SP_INFOTRON, EL_SP_DISK_ORANGE, @@ -1328,27 +1515,27 @@ void InitElementProperties() static int ep_can_smash[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_SCHLUESSEL1, - EL_SCHLUESSEL2, - EL_SCHLUESSEL3, - EL_SCHLUESSEL4, - EL_EM_KEY_1, - EL_EM_KEY_2, - EL_EM_KEY_3, - EL_EM_KEY_4, - EL_BOMBE, - EL_KOKOSNUSS, - EL_TROPFEN, - EL_ZEIT_VOLL, - EL_ZEIT_LEER, + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND, + EL_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, + EL_EM_KEY1, + EL_EM_KEY2, + EL_EM_KEY3, + EL_EM_KEY4, + EL_BOMB, + EL_NUT, + EL_AMOEBA_DROP, + EL_TIME_ORB_FULL, + EL_TIME_ORB_EMPTY, EL_SP_ZONK, EL_SP_INFOTRON, EL_SP_DISK_ORANGE, @@ -1361,32 +1548,32 @@ void InitElementProperties() static int ep_can_change[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND }; static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change); static int ep_can_move[] = { - EL_KAEFER, - EL_FLIEGER, - EL_BUTTERFLY, - EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + EL_BUG, + EL_SPACESHIP, + EL_BD_BUTTERFLY, + EL_BD_FIREFLY, + EL_YAMYAM, + EL_DARK_YAMYAM, EL_ROBOT, EL_PACMAN, EL_MOLE, - EL_PINGUIN, - EL_SCHWEIN, - EL_DRACHE, - EL_SONDE, + EL_PENGUIN, + EL_PIG, + EL_DRAGON, + EL_SATELLITE, EL_SP_SNIKSNAK, EL_SP_ELECTRON, EL_BALLOON, @@ -1396,22 +1583,22 @@ void InitElementProperties() static int ep_could_move[] = { - EL_KAEFER_RIGHT, - EL_KAEFER_UP, - EL_KAEFER_LEFT, - EL_KAEFER_DOWN, - EL_FLIEGER_RIGHT, - EL_FLIEGER_UP, - EL_FLIEGER_LEFT, - EL_FLIEGER_DOWN, - EL_BUTTERFLY_RIGHT, - EL_BUTTERFLY_UP, - EL_BUTTERFLY_LEFT, - EL_BUTTERFLY_DOWN, - EL_FIREFLY_RIGHT, - EL_FIREFLY_UP, - EL_FIREFLY_LEFT, - EL_FIREFLY_DOWN, + EL_BUG_RIGHT, + EL_BUG_UP, + EL_BUG_LEFT, + EL_BUG_DOWN, + EL_SPACESHIP_RIGHT, + EL_SPACESHIP_UP, + EL_SPACESHIP_LEFT, + EL_SPACESHIP_DOWN, + EL_BD_BUTTERFLY_RIGHT, + EL_BD_BUTTERFLY_UP, + EL_BD_BUTTERFLY_LEFT, + EL_BD_BUTTERFLY_DOWN, + EL_BD_FIREFLY_RIGHT, + EL_BD_FIREFLY_UP, + EL_BD_FIREFLY_LEFT, + EL_BD_FIREFLY_DOWN, EL_PACMAN_RIGHT, EL_PACMAN_UP, EL_PACMAN_LEFT, @@ -1421,28 +1608,28 @@ void InitElementProperties() static int ep_dont_touch[] = { - EL_KAEFER, - EL_FLIEGER, - EL_BUTTERFLY, - EL_FIREFLY + EL_BUG, + EL_SPACESHIP, + EL_BD_BUTTERFLY, + EL_BD_FIREFLY }; static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch); static int ep_dont_go_to[] = { - EL_KAEFER, - EL_FLIEGER, - EL_BUTTERFLY, - EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + EL_BUG, + EL_SPACESHIP, + EL_BD_BUTTERFLY, + EL_BD_FIREFLY, + EL_YAMYAM, + EL_DARK_YAMYAM, EL_ROBOT, EL_PACMAN, - EL_TROPFEN, - EL_SALZSAEURE, + EL_AMOEBA_DROP, + EL_ACID, EL_SP_SNIKSNAK, EL_SP_ELECTRON, - EL_SP_BUG_ACTIVE, + EL_SP_BUGGY_BASE_ACTIVE, EL_TRAP_ACTIVE, EL_LANDMINE }; @@ -1450,26 +1637,26 @@ void InitElementProperties() static int ep_mampf2[] = { - EL_ERDREICH, - EL_KAEFER, - EL_FLIEGER, - EL_BUTTERFLY, - EL_FIREFLY, - EL_MAMPFER, + EL_SAND, + EL_BUG, + EL_SPACESHIP, + EL_BD_BUTTERFLY, + EL_BD_FIREFLY, + EL_YAMYAM, EL_ROBOT, EL_PACMAN, - EL_TROPFEN, - EL_AMOEBE_TOT, - EL_AMOEBE_NASS, - EL_AMOEBE_NORM, - EL_AMOEBE_VOLL, - EL_AMOEBE_BD, - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, + EL_AMOEBA_DROP, + EL_AMOEBA_DEAD, + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA, + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND, EL_PEARL, EL_CRYSTAL }; @@ -1477,119 +1664,118 @@ void InitElementProperties() static int ep_bd_element[] = { - EL_LEERRAUM, - EL_ERDREICH, - EL_FELSBODEN, + EL_EMPTY, + EL_SAND, + EL_WALL_CRUMBLED, EL_BD_WALL, - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN_BD, - EL_MAGIC_WALL_BD_OFF, - EL_AUSGANG_ZU, - EL_AUSGANG_AUF, - EL_BETON, - EL_SPIELFIGUR, - EL_FIREFLY, - EL_FIREFLY_1, - EL_FIREFLY_2, - EL_FIREFLY_3, - EL_FIREFLY_4, - EL_BUTTERFLY, - EL_BUTTERFLY_1, - EL_BUTTERFLY_2, - EL_BUTTERFLY_3, - EL_BUTTERFLY_4, - EL_AMOEBE_BD, - EL_CHAR_FRAGE + EL_BD_DIAMOND, + EL_BD_MAGIC_WALL, + EL_EXIT_CLOSED, + EL_EXIT_OPEN, + EL_STEELWALL, + EL_PLAYER, + EL_BD_FIREFLY, + EL_BD_FIREFLY_1, + EL_BD_FIREFLY_2, + EL_BD_FIREFLY_3, + EL_BD_FIREFLY_4, + EL_BD_BUTTERFLY, + EL_BD_BUTTERFLY_1, + EL_BD_BUTTERFLY_2, + EL_BD_BUTTERFLY_3, + EL_BD_BUTTERFLY_4, + EL_BD_AMOEBA, + EL_CHAR_QUESTION }; static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element); static int ep_sb_element[] = { - EL_LEERRAUM, - EL_BETON, - EL_SOKOBAN_OBJEKT, - EL_SOKOBAN_FELD_LEER, - EL_SOKOBAN_FELD_VOLL, - EL_SPIELFIGUR, - EL_INVISIBLE_STEEL + EL_EMPTY, + EL_STEELWALL, + EL_SOKOBAN_OBJECT, + EL_SOKOBAN_FIELD_EMPTY, + EL_SOKOBAN_FIELD_FULL, + EL_PLAYER, + EL_INVISIBLE_STEELWALL }; static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element); static int ep_gem[] = { - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND }; static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem); static int ep_inactive[] = { - EL_LEERRAUM, - EL_ERDREICH, - EL_MAUERWERK, + EL_EMPTY, + EL_SAND, + EL_WALL, EL_BD_WALL, - EL_FELSBODEN, - EL_SCHLUESSEL, - EL_BETON, - EL_AMOEBE_TOT, - EL_MORAST_LEER, - EL_BADEWANNE, - EL_ABLENK_AUS, - EL_SCHLUESSEL1, - EL_SCHLUESSEL2, - EL_SCHLUESSEL3, - EL_SCHLUESSEL4, - EL_EM_KEY_1, - EL_EM_KEY_2, - EL_EM_KEY_3, - EL_EM_KEY_4, - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, - EL_DYNAMITE_INACTIVE, - EL_UNSICHTBAR, - EL_BIRNE_AUS, - EL_BIRNE_EIN, - EL_ERZ_EDEL, - EL_ERZ_DIAM, - EL_ERZ_EDEL_BD, - EL_ERZ_EDEL_GELB, + EL_WALL_CRUMBLED, + EL_STEELWALL, + EL_AMOEBA_DEAD, + EL_QUICKSAND_EMPTY, + EL_STONEBLOCK, + EL_ROBOT_WHEEL, + EL_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, + EL_EM_KEY1, + EL_EM_KEY2, + EL_EM_KEY3, + EL_EM_KEY4, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, + EL_DYNAMITE, + EL_INVISIBLE_WALL, + EL_LAMP, + EL_LAMP_ACTIVE, + EL_WALL_EMERALD, + EL_WALL_DIAMOND, + EL_WALL_BD_DIAMOND, + EL_WALL_EMERALD_YELLOW, EL_DYNABOMB_NR, EL_DYNABOMB_SZ, EL_DYNABOMB_XL, - EL_SOKOBAN_OBJEKT, - EL_SOKOBAN_FELD_LEER, - EL_SOKOBAN_FELD_VOLL, - EL_ERZ_EDEL_ROT, - EL_ERZ_EDEL_LILA, - EL_BADEWANNE1, - EL_BADEWANNE2, - EL_BADEWANNE3, - EL_BADEWANNE4, - EL_BADEWANNE5, - EL_MAGIC_WALL_OFF, + EL_SOKOBAN_OBJECT, + EL_SOKOBAN_FIELD_EMPTY, + EL_SOKOBAN_FIELD_FULL, + EL_WALL_EMERALD_RED, + EL_WALL_EMERALD_PURPLE, + EL_ACIDPOOL_TOPLEFT, + EL_ACIDPOOL_TOPRIGHT, + EL_ACIDPOOL_BOTTOMLEFT, + EL_ACIDPOOL_BOTTOM, + EL_ACIDPOOL_BOTTOMRIGHT, + EL_MAGIC_WALL, EL_MAGIC_WALL_DEAD, - EL_MAGIC_WALL_BD_OFF, - EL_MAGIC_WALL_BD_DEAD, - EL_AMOEBA2DIAM, + EL_BD_MAGIC_WALL, + EL_BD_MAGIC_WALL_DEAD, + EL_AMOEBA_TO_DIAMOND, EL_BLOCKED, EL_SP_EMPTY, EL_SP_BASE, @@ -1622,20 +1808,19 @@ void InitElementProperties() EL_SP_HARD_BASE4, EL_SP_HARD_BASE5, EL_SP_HARD_BASE6, - EL_SP_EXIT, - EL_INVISIBLE_STEEL, - EL_BELT1_SWITCH_LEFT, - EL_BELT1_SWITCH_MIDDLE, - EL_BELT1_SWITCH_RIGHT, - EL_BELT2_SWITCH_LEFT, - EL_BELT2_SWITCH_MIDDLE, - EL_BELT2_SWITCH_RIGHT, - EL_BELT3_SWITCH_LEFT, - EL_BELT3_SWITCH_MIDDLE, - EL_BELT3_SWITCH_RIGHT, - EL_BELT4_SWITCH_LEFT, - EL_BELT4_SWITCH_MIDDLE, - EL_BELT4_SWITCH_RIGHT, + EL_INVISIBLE_STEELWALL, + EL_CONVEYOR_BELT1_SWITCH_LEFT, + EL_CONVEYOR_BELT1_SWITCH_MIDDLE, + EL_CONVEYOR_BELT1_SWITCH_RIGHT, + EL_CONVEYOR_BELT2_SWITCH_LEFT, + EL_CONVEYOR_BELT2_SWITCH_MIDDLE, + EL_CONVEYOR_BELT2_SWITCH_RIGHT, + EL_CONVEYOR_BELT3_SWITCH_LEFT, + EL_CONVEYOR_BELT3_SWITCH_MIDDLE, + EL_CONVEYOR_BELT3_SWITCH_RIGHT, + EL_CONVEYOR_BELT4_SWITCH_LEFT, + EL_CONVEYOR_BELT4_SWITCH_MIDDLE, + EL_CONVEYOR_BELT4_SWITCH_RIGHT, EL_SIGN_EXCLAMATION, EL_SIGN_RADIOACTIVITY, EL_SIGN_STOP, @@ -1648,27 +1833,27 @@ void InitElementProperties() EL_SIGN_EXIT, EL_SIGN_YINYANG, EL_SIGN_OTHER, - EL_STEEL_SLANTED, - EL_EMC_STEEL_WALL_1, - EL_EMC_STEEL_WALL_2, - EL_EMC_STEEL_WALL_3, - EL_EMC_STEEL_WALL_4, - EL_EMC_WALL_1, - EL_EMC_WALL_2, - EL_EMC_WALL_3, - EL_EMC_WALL_4, - EL_EMC_WALL_5, - EL_EMC_WALL_6, - EL_EMC_WALL_7, - EL_EMC_WALL_8 + EL_STEELWALL_SLANTED, + EL_EMC_STEELWALL1, + EL_EMC_STEELWALL2, + EL_EMC_STEELWALL3, + EL_EMC_STEELWALL4, + EL_EMC_WALL_PILLAR_UPPER, + EL_EMC_WALL_PILLAR_MIDDLE, + EL_EMC_WALL_PILLAR_LOWER, + EL_EMC_WALL4, + EL_EMC_WALL5, + EL_EMC_WALL6, + EL_EMC_WALL7, + EL_EMC_WALL8 }; static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive); static int ep_explosive[] = { - EL_BOMBE, + EL_BOMB, EL_DYNAMITE_ACTIVE, - EL_DYNAMITE_INACTIVE, + EL_DYNAMITE, EL_DYNABOMB_ACTIVE_1, EL_DYNABOMB_ACTIVE_2, EL_DYNABOMB_ACTIVE_3, @@ -1676,12 +1861,12 @@ void InitElementProperties() EL_DYNABOMB_NR, EL_DYNABOMB_SZ, EL_DYNABOMB_XL, - EL_KAEFER, + EL_BUG, EL_MOLE, - EL_PINGUIN, - EL_SCHWEIN, - EL_DRACHE, - EL_SONDE, + EL_PENGUIN, + EL_PIG, + EL_DRAGON, + EL_SATELLITE, EL_SP_DISK_RED, EL_SP_DISK_ORANGE, EL_SP_DISK_YELLOW, @@ -1693,12 +1878,12 @@ void InitElementProperties() static int ep_mampf3[] = { - EL_EDELSTEIN, - EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, + EL_EMERALD, + EL_BD_DIAMOND, + EL_EMERALD_YELLOW, + EL_EMERALD_RED, + EL_EMERALD_PURPLE, + EL_DIAMOND, EL_PEARL, EL_CRYSTAL }; @@ -1706,14 +1891,14 @@ void InitElementProperties() static int ep_pushable[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_BOMBE, - EL_KOKOSNUSS, - EL_ZEIT_LEER, - EL_SOKOBAN_FELD_VOLL, - EL_SOKOBAN_OBJEKT, - EL_SONDE, + EL_BOMB, + EL_NUT, + EL_TIME_ORB_EMPTY, + EL_SOKOBAN_FIELD_FULL, + EL_SOKOBAN_OBJECT, + EL_SATELLITE, EL_SP_ZONK, EL_SP_DISK_ORANGE, EL_SP_DISK_YELLOW, @@ -1725,31 +1910,31 @@ void InitElementProperties() static int ep_player[] = { - EL_SPIELFIGUR, - EL_SPIELER1, - EL_SPIELER2, - EL_SPIELER3, - EL_SPIELER4 + EL_PLAYER, + EL_PLAYER1, + EL_PLAYER2, + EL_PLAYER3, + EL_PLAYER4 }; static int ep_player_num = SIZEOF_ARRAY_INT(ep_player); static int ep_has_content[] = { - EL_MAMPFER, - EL_AMOEBE_NASS, - EL_AMOEBE_NORM, - EL_AMOEBE_VOLL, - EL_AMOEBE_BD + EL_YAMYAM, + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA }; static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content); static int ep_eatable[] = { - EL_ERDREICH, + EL_SAND, EL_SP_BASE, - EL_SP_BUG, - EL_TRAP_INACTIVE, - EL_SAND_INVISIBLE + EL_SP_BUGGY_BASE, + EL_TRAP, + EL_INVISIBLE_SAND }; static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable); @@ -1762,7 +1947,8 @@ void InitElementProperties() EL_SP_INFOTRON, EL_SP_CHIP_SINGLE, EL_SP_HARD_GRAY, - EL_SP_EXIT, + EL_SP_EXIT_CLOSED, + EL_SP_EXIT_OPEN, EL_SP_DISK_ORANGE, EL_SP_PORT1_RIGHT, EL_SP_PORT1_DOWN, @@ -1780,7 +1966,7 @@ void InitElementProperties() EL_SP_PORT_X, EL_SP_PORT_XY, EL_SP_ELECTRON, - EL_SP_BUG, + EL_SP_BUGGY_BASE, EL_SP_CHIP_LEFT, EL_SP_CHIP_RIGHT, EL_SP_HARD_BASE1, @@ -1796,7 +1982,7 @@ void InitElementProperties() EL_SP_CHIP_UPPER, EL_SP_CHIP_LOWER, /* additional elements that appeared in newer Supaplex levels */ - EL_UNSICHTBAR, + EL_INVISIBLE_WALL, /* more than one murphy in a level results in an inactive clone */ EL_SP_MURPHY_CLONE }; @@ -1804,14 +1990,14 @@ void InitElementProperties() static int ep_quick_gate[] = { - EL_EM_GATE_1, - EL_EM_GATE_2, - EL_EM_GATE_3, - EL_EM_GATE_4, - EL_EM_GATE_1X, - EL_EM_GATE_2X, - EL_EM_GATE_3X, - EL_EM_GATE_4X, + EL_EM_GATE1, + EL_EM_GATE2, + EL_EM_GATE3, + EL_EM_GATE4, + EL_EM_GATE1_GRAY, + EL_EM_GATE2_GRAY, + EL_EM_GATE3_GRAY, + EL_EM_GATE4_GRAY, EL_SP_PORT1_LEFT, EL_SP_PORT2_LEFT, EL_SP_PORT1_RIGHT, @@ -1841,13 +2027,13 @@ void InitElementProperties() EL_SP_PORT_X, EL_SP_PORT_Y, EL_SP_PORT_XY, - EL_TUBE_CROSS, + EL_TUBE_ALL, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, - EL_TUBE_VERT_LEFT, - EL_TUBE_VERT_RIGHT, - EL_TUBE_HORIZ_UP, - EL_TUBE_HORIZ_DOWN, + EL_TUBE_VERTICAL_LEFT, + EL_TUBE_VERTICAL_RIGHT, + EL_TUBE_HORIZONTAL_UP, + EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_UP, EL_TUBE_LEFT_DOWN, EL_TUBE_RIGHT_UP, @@ -1867,47 +2053,64 @@ void InitElementProperties() static int ep_belt[] = { - EL_BELT1_LEFT, - EL_BELT1_MIDDLE, - EL_BELT1_RIGHT, - EL_BELT2_LEFT, - EL_BELT2_MIDDLE, - EL_BELT2_RIGHT, - EL_BELT3_LEFT, - EL_BELT3_MIDDLE, - EL_BELT3_RIGHT, - EL_BELT4_LEFT, - EL_BELT4_MIDDLE, - EL_BELT4_RIGHT, + EL_CONVEYOR_BELT1_LEFT, + EL_CONVEYOR_BELT1_MIDDLE, + EL_CONVEYOR_BELT1_RIGHT, + EL_CONVEYOR_BELT2_LEFT, + EL_CONVEYOR_BELT2_MIDDLE, + EL_CONVEYOR_BELT2_RIGHT, + EL_CONVEYOR_BELT3_LEFT, + EL_CONVEYOR_BELT3_MIDDLE, + EL_CONVEYOR_BELT3_RIGHT, + EL_CONVEYOR_BELT4_LEFT, + EL_CONVEYOR_BELT4_MIDDLE, + EL_CONVEYOR_BELT4_RIGHT, }; static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt); + static int ep_belt_active[] = + { + EL_CONVEYOR_BELT1_LEFT_ACTIVE, + EL_CONVEYOR_BELT1_MIDDLE_ACTIVE, + EL_CONVEYOR_BELT1_RIGHT_ACTIVE, + EL_CONVEYOR_BELT2_LEFT_ACTIVE, + EL_CONVEYOR_BELT2_MIDDLE_ACTIVE, + EL_CONVEYOR_BELT2_RIGHT_ACTIVE, + EL_CONVEYOR_BELT3_LEFT_ACTIVE, + EL_CONVEYOR_BELT3_MIDDLE_ACTIVE, + EL_CONVEYOR_BELT3_RIGHT_ACTIVE, + EL_CONVEYOR_BELT4_LEFT_ACTIVE, + EL_CONVEYOR_BELT4_MIDDLE_ACTIVE, + EL_CONVEYOR_BELT4_RIGHT_ACTIVE, + }; + static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active); + static int ep_belt_switch[] = { - EL_BELT1_SWITCH_LEFT, - EL_BELT1_SWITCH_MIDDLE, - EL_BELT1_SWITCH_RIGHT, - EL_BELT2_SWITCH_LEFT, - EL_BELT2_SWITCH_MIDDLE, - EL_BELT2_SWITCH_RIGHT, - EL_BELT3_SWITCH_LEFT, - EL_BELT3_SWITCH_MIDDLE, - EL_BELT3_SWITCH_RIGHT, - EL_BELT4_SWITCH_LEFT, - EL_BELT4_SWITCH_MIDDLE, - EL_BELT4_SWITCH_RIGHT, + EL_CONVEYOR_BELT1_SWITCH_LEFT, + EL_CONVEYOR_BELT1_SWITCH_MIDDLE, + EL_CONVEYOR_BELT1_SWITCH_RIGHT, + EL_CONVEYOR_BELT2_SWITCH_LEFT, + EL_CONVEYOR_BELT2_SWITCH_MIDDLE, + EL_CONVEYOR_BELT2_SWITCH_RIGHT, + EL_CONVEYOR_BELT3_SWITCH_LEFT, + EL_CONVEYOR_BELT3_SWITCH_MIDDLE, + EL_CONVEYOR_BELT3_SWITCH_RIGHT, + EL_CONVEYOR_BELT4_SWITCH_LEFT, + EL_CONVEYOR_BELT4_SWITCH_MIDDLE, + EL_CONVEYOR_BELT4_SWITCH_RIGHT, }; static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch); static int ep_tube[] = { - EL_TUBE_CROSS, + EL_TUBE_ALL, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, - EL_TUBE_VERT_LEFT, - EL_TUBE_VERT_RIGHT, - EL_TUBE_HORIZ_UP, - EL_TUBE_HORIZ_DOWN, + EL_TUBE_VERTICAL_LEFT, + EL_TUBE_VERTICAL_RIGHT, + EL_TUBE_HORIZONTAL_UP, + EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_UP, EL_TUBE_LEFT_DOWN, EL_TUBE_RIGHT_UP, @@ -1952,6 +2155,7 @@ void InitElementProperties() static long ep2_bit[] = { EP_BIT_BELT, + EP_BIT_BELT_ACTIVE, EP_BIT_BELT_SWITCH, EP_BIT_TUBE }; @@ -1992,6 +2196,7 @@ void InitElementProperties() static int *ep2_array[] = { ep_belt, + ep_belt_active, ep_belt_switch, ep_tube }; @@ -2032,6 +2237,7 @@ void InitElementProperties() static int *ep2_num[] = { &ep_belt_num, + &ep_belt_active_num, &ep_belt_switch_num, &ep_tube_num }; @@ -2069,10 +2275,10 @@ void Execute_Debug_Command(char *command) printf("%s\n", getFormattedSetupEntry("sort_priority", "100")); printf("\n"); - for (i=0; i