X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=8c391363250de573fbed086afb9b39ed25c448a5;hb=aff866268cfa75327030bedcbf64a507fdc3fac2;hp=8f957e30837f16165db67f41dee238b7f5fcc3ca;hpb=6279921cda22181d9ca97cc65fdfe832ee699be0;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 8f957e30..8c391363 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) @@ -100,7 +103,6 @@ void OpenAll(void) InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ InitElementInfo(); - InitGraphicInfo(); InitLevelInfo(); InitLevelArtworkInfo(); @@ -176,16 +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,29 +1047,29 @@ 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_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, EL_EM_KEY_1, EL_EM_KEY_2, EL_EM_KEY_3, @@ -906,14 +1079,14 @@ void InitElementProperties() static int ep_pforte[] = { - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, EL_EM_GATE_1, EL_EM_GATE_2, EL_EM_GATE_3, @@ -946,27 +1119,27 @@ void InitElementProperties() static int ep_solid[] = { - EL_BETON, - EL_MAUERWERK, + EL_STEELWALL, + EL_WALL, EL_MAUER_LEBT, EL_MAUER_X, EL_MAUER_Y, EL_MAUER_XY, EL_BD_WALL, - EL_FELSBODEN, - EL_AUSGANG_ZU, + EL_WALL_CRUMBLED, + EL_EXIT_CLOSED, 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_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, EL_MAGIC_WALL_EMPTY, EL_MAGIC_WALL_EMPTYING, EL_MAGIC_WALL_FILLING, @@ -978,13 +1151,13 @@ void InitElementProperties() 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_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, @@ -1051,14 +1224,14 @@ void InitElementProperties() 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_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, EL_EM_GATE_1, EL_EM_GATE_2, EL_EM_GATE_3, @@ -1091,13 +1264,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, @@ -1142,14 +1315,14 @@ void InitElementProperties() EL_EMC_STEEL_WALL_3, EL_EMC_STEEL_WALL_4, EL_CRYSTAL, - EL_PFORTE1, - EL_PFORTE2, - EL_PFORTE3, - EL_PFORTE4, - EL_PFORTE1X, - EL_PFORTE2X, - EL_PFORTE3X, - EL_PFORTE4X, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, EL_EM_GATE_1, EL_EM_GATE_2, EL_EM_GATE_3, @@ -1182,26 +1355,26 @@ void InitElementProperties() static int ep_slippery[] = { - EL_FELSBODEN, + EL_WALL_CRUMBLED, EL_BD_WALL, - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, + EL_EMERALD, 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_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_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_SONDE, EL_SP_ZONK, EL_SP_INFOTRON, @@ -1219,12 +1392,12 @@ void InitElementProperties() static int ep_enemy[] = { - EL_KAEFER, - EL_FLIEGER, + EL_BUG, + EL_SPACESHIP, EL_BUTTERFLY, EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + EL_YAMYAM, + EL_DARK_YAMYAM, EL_ROBOT, EL_PACMAN, EL_SP_SNIKSNAK, @@ -1234,15 +1407,15 @@ 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_STEELWALL, + EL_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, EL_EM_GATE_1, EL_EM_GATE_2, EL_EM_GATE_3, @@ -1251,11 +1424,11 @@ void InitElementProperties() EL_EM_GATE_2X, EL_EM_GATE_3X, EL_EM_GATE_4X, - EL_AUSGANG_ZU, + EL_EXIT_CLOSED, EL_AUSGANG_ACT, - EL_AUSGANG_AUF, - EL_MAUERWERK, - EL_FELSBODEN, + EL_EXIT_OPEN, + EL_WALL, + EL_WALL_CRUMBLED, EL_MAUER_LEBT, EL_MAUER_X, EL_MAUER_Y, @@ -1300,22 +1473,22 @@ void InitElementProperties() static int ep_can_fall[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_BOMBE, - EL_KOKOSNUSS, - EL_TROPFEN, - EL_MORAST_VOLL, + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_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_TIME_ORB_FULL, + EL_TIME_ORB_EMPTY, EL_SP_ZONK, EL_SP_INFOTRON, EL_SP_DISK_ORANGE, @@ -1328,27 +1501,27 @@ void InitElementProperties() static int ep_can_smash[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_SCHLUESSEL1, - EL_SCHLUESSEL2, - EL_SCHLUESSEL3, - EL_SCHLUESSEL4, + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_PURPLE, + EL_DIAMOND, + EL_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, 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_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,25 +1534,25 @@ void InitElementProperties() static int ep_can_change[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_EDELSTEIN, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_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_BUG, + EL_SPACESHIP, EL_BUTTERFLY, EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + EL_YAMYAM, + EL_DARK_YAMYAM, EL_ROBOT, EL_PACMAN, EL_MOLE, @@ -1396,14 +1569,14 @@ 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_BUG_RIGHT, + EL_BUG_UP, + EL_BUG_LEFT, + EL_BUG_DOWN, + EL_SPACESHIP_RIGHT, + EL_SPACESHIP_UP, + EL_SPACESHIP_LEFT, + EL_SPACESHIP_DOWN, EL_BUTTERFLY_RIGHT, EL_BUTTERFLY_UP, EL_BUTTERFLY_LEFT, @@ -1421,8 +1594,8 @@ void InitElementProperties() static int ep_dont_touch[] = { - EL_KAEFER, - EL_FLIEGER, + EL_BUG, + EL_SPACESHIP, EL_BUTTERFLY, EL_FIREFLY }; @@ -1430,16 +1603,16 @@ void InitElementProperties() static int ep_dont_go_to[] = { - EL_KAEFER, - EL_FLIEGER, + EL_BUG, + EL_SPACESHIP, EL_BUTTERFLY, EL_FIREFLY, - EL_MAMPFER, - EL_MAMPFER2, + 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, @@ -1450,26 +1623,26 @@ void InitElementProperties() static int ep_mampf2[] = { - EL_ERDREICH, - EL_KAEFER, - EL_FLIEGER, + EL_SAND, + EL_BUG, + EL_SPACESHIP, EL_BUTTERFLY, EL_FIREFLY, - EL_MAMPFER, + 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_AMOEBA_DROP, + EL_AMOEBA_DEAD, + EL_AMOEBA_WET, + EL_AMOEBA_DRY, + EL_AMOEBA_FULL, + EL_BD_AMOEBA, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_PURPLE, + EL_DIAMOND, EL_PEARL, EL_CRYSTAL }; @@ -1477,18 +1650,18 @@ 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_EXIT_CLOSED, + EL_EXIT_OPEN, + EL_STEELWALL, + EL_PLAYER, EL_FIREFLY, EL_FIREFLY_1, EL_FIREFLY_2, @@ -1499,63 +1672,63 @@ void InitElementProperties() EL_BUTTERFLY_2, EL_BUTTERFLY_3, EL_BUTTERFLY_4, - EL_AMOEBE_BD, + EL_BD_AMOEBA, EL_CHAR_FRAGE }; static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element); static int ep_sb_element[] = { - EL_LEERRAUM, - EL_BETON, + EL_EMPTY, + EL_STEELWALL, EL_SOKOBAN_OBJEKT, EL_SOKOBAN_FELD_LEER, EL_SOKOBAN_FELD_VOLL, - EL_SPIELFIGUR, + EL_PLAYER, EL_INVISIBLE_STEEL }; static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element); static int ep_gem[] = { - EL_EDELSTEIN, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_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_WALL_CRUMBLED, + EL_KEY, + EL_STEELWALL, + EL_AMOEBA_DEAD, + EL_QUICKSAND_EMPTY, EL_BADEWANNE, - EL_ABLENK_AUS, - EL_SCHLUESSEL1, - EL_SCHLUESSEL2, - EL_SCHLUESSEL3, - EL_SCHLUESSEL4, + EL_ROBOT_WHEEL, + EL_KEY1, + EL_KEY2, + EL_KEY3, + EL_KEY4, 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_GATE1, + EL_GATE2, + EL_GATE3, + EL_GATE4, + EL_GATE1_GRAY, + EL_GATE2_GRAY, + EL_GATE3_GRAY, + EL_GATE4_GRAY, EL_EM_GATE_1, EL_EM_GATE_2, EL_EM_GATE_3, @@ -1564,28 +1737,28 @@ void InitElementProperties() 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_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_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, @@ -1666,9 +1839,9 @@ void InitElementProperties() 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,7 +1849,7 @@ void InitElementProperties() EL_DYNABOMB_NR, EL_DYNABOMB_SZ, EL_DYNABOMB_XL, - EL_KAEFER, + EL_BUG, EL_MOLE, EL_PINGUIN, EL_SCHWEIN, @@ -1693,12 +1866,12 @@ void InitElementProperties() static int ep_mampf3[] = { - EL_EDELSTEIN, + EL_EMERALD, EL_EDELSTEIN_BD, - EL_EDELSTEIN_GELB, - EL_EDELSTEIN_ROT, - EL_EDELSTEIN_LILA, - EL_DIAMANT, + EL_EDELSTEIN_YELLOW, + EL_EDELSTEIN_RED, + EL_EDELSTEIN_PURPLE, + EL_DIAMOND, EL_PEARL, EL_CRYSTAL }; @@ -1706,11 +1879,11 @@ void InitElementProperties() static int ep_pushable[] = { - EL_FELSBROCKEN, + EL_ROCK, EL_BD_ROCK, - EL_BOMBE, - EL_KOKOSNUSS, - EL_ZEIT_LEER, + EL_BOMB, + EL_NUT, + EL_TIME_ORB_EMPTY, EL_SOKOBAN_FELD_VOLL, EL_SOKOBAN_OBJEKT, EL_SONDE, @@ -1725,7 +1898,7 @@ void InitElementProperties() static int ep_player[] = { - EL_SPIELFIGUR, + EL_PLAYER, EL_SPIELER1, EL_SPIELER2, EL_SPIELER3, @@ -1735,17 +1908,17 @@ void InitElementProperties() 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, @@ -1796,7 +1969,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 }; @@ -2069,10 +2242,10 @@ void Execute_Debug_Command(char *command) printf("%s\n", getFormattedSetupEntry("sort_priority", "100")); printf("\n"); - for (i=0; i