X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=29f59e295375df4880caf064ef3e918bdc9cd125;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=39979e76275fa368ee97c27f28c56da02314f722;hpb=79411a5006963926966da0465fd46344a34a57fe;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 39979e76..29f59e29 100644 --- a/src/init.c +++ b/src/init.c @@ -26,8 +26,20 @@ #include "cartoons.h" #include "config.h" +#include "conf_e2g.c" /* include auto-generated data structure definitions */ + + static char *image_filename[NUM_PICTURES] = { +#if 0 + "RocksScreen.pcx", + "RocksDoor.pcx", + "RocksToons.pcx", + "RocksFontBig.pcx", + "RocksFontSmall.pcx", + "RocksFontMedium.pcx", + "RocksFontEM.pcx" +#else "RocksScreen.pcx", "RocksElements.pcx", "RocksDoor.pcx", @@ -40,8 +52,12 @@ static char *image_filename[NUM_PICTURES] = "RocksFontSmall.pcx", "RocksFontMedium.pcx", "RocksFontEM.pcx" +#endif }; +static Bitmap *bitmap_font_initial = NULL; + +static void InitGlobal(void); static void InitSetup(void); static void InitPlayerInfo(void); static void InitLevelInfo(void); @@ -58,16 +74,14 @@ static void InitElementProperties(void); static void InitElementInfo(void); static void InitGraphicInfo(void); static void InitSoundInfo(); -static void Execute_Debug_Command(char *); +static void Execute_Command(char *); void OpenAll(void) { - if (options.debug_command) - { - Execute_Debug_Command(options.debug_command); + InitGlobal(); /* initialize some global variables */ - exit(0); - } + if (options.execute_command) + Execute_Command(options.execute_command); if (options.serveronly) { @@ -100,24 +114,42 @@ void OpenAll(void) InitEventFilter(FilterMouseMotionEvents); - InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ InitElementInfo(); + InitGfx(); + InitLevelInfo(); InitLevelArtworkInfo(); - InitGadgets(); /* needs to know number of level series */ + InitImages(); /* needs to know current level directory */ InitSound(); /* needs to know current level directory */ +#if 0 + InitGadgets(); /* needs images + number of level series */ +#endif InitGfxBackground(); - InitToons(); + + if (global.autoplay_leveldir) + { + AutoPlayTape(); + return; + } DrawMainMenu(); InitNetworkServer(); } +void InitGlobal() +{ + global.autoplay_leveldir = NULL; + + global.frames_per_second = 0; + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; +} + void InitSetup() { LoadSetup(); /* global setup info */ @@ -176,14 +208,30 @@ void InitNetworkServer() #endif } +static void ReinitializeGraphics() +{ + ReloadCustomImages(); /* load custom image files */ + + InitGraphicInfo(); /* initialize graphic info from config file */ + + InitFontInfo(bitmap_font_initial, + new_graphic_info[IMG_FONT_BIG].bitmap, + new_graphic_info[IMG_FONT_MEDIUM].bitmap, + new_graphic_info[IMG_FONT_SMALL].bitmap, + new_graphic_info[IMG_FONT_EM].bitmap); + + SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT); + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + + InitGadgets(); + InitToons(); +} + static void InitImages() { InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES); - /* load custom images */ - ReloadCustomImages(); - - InitGraphicInfo(); + ReinitializeGraphics(); } static void InitMixer() @@ -206,11 +254,14 @@ static void InitSound() static void InitTileClipmasks() { +#if 0 #if defined(TARGET_X11) XGCValues clip_gc_values; unsigned long clip_gc_valuemask; #if defined(TARGET_X11_NATIVE) + +#if 0 GC copy_clipmask_gc; static struct @@ -264,13 +315,15 @@ static void InitTileClipmasks() { GFX2_SHIELD_ACTIVE, 3 }, { -1, 0 } }; +#endif + #endif /* TARGET_X11_NATIVE */ #endif /* TARGET_X11 */ int i; /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */ - for(i=0; idrawable, clip_gc_valuemask, &clip_gc_values); - for(i=0; iclip_mask) { @@ -295,9 +349,11 @@ static void InitTileClipmasks() clip_gc_valuemask, &clip_gc_values); } } +#endif #if defined(TARGET_X11_NATIVE) +#if 0 /* create graphic context structures needed for clipping */ clip_gc_values.graphics_exposures = False; clip_gc_valuemask = GCGraphicsExposures; @@ -305,11 +361,11 @@ static void InitTileClipmasks() clip_gc_valuemask, &clip_gc_values); /* create only those clipping Pixmaps we really need */ - for(i=0; tile_needs_clipping[i].start>=0; i++) + for (i=0; tile_needs_clipping[i].start>=0; i++) { int j; - for(j=0; jstored_clip_gc) { @@ -360,17 +420,17 @@ void FreeTileClipmasks() pix[i]->stored_clip_gc = None; } } +#endif + #endif /* TARGET_X11 */ +#endif } void InitGfx() { +#if 0 int i; - - /* initialize some global variables */ - global.frames_per_second = 0; - global.fps_slowdown = FALSE; - global.fps_slowdown_factor = 1; +#endif /* initialize screen properties */ InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE, @@ -380,30 +440,42 @@ void InitGfx() InitGfxScrollbufferInfo(FXSIZE, FYSIZE); /* create additional image buffers for double-buffering */ - pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); - pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); + bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); + bitmap_db_door = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); +#if 0 pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]); InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL); +#else + bitmap_font_initial = LoadCustomImage(image_filename[PIX_FONT_SMALL]); + + InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL); +#endif DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW); DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED); DrawInitText("Loading graphics:", 120, FC_GREEN); - for(i=0; iidentifier; char *snd_new_identifier = artwork.snd_current->identifier; char *mus_new_identifier = artwork.mus_current->identifier; + boolean redraw_screen = FALSE; + + if (leveldir_current_identifier == NULL) + leveldir_current_identifier = leveldir_current->identifier; + +#if 0 + printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier, + leveldir_current->graphics_set); + printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier, + leveldir_current->identifier); +#endif #if 0 printf("graphics --> '%s' ('%s')\n", @@ -489,31 +572,52 @@ void ReloadCustomArtwork() if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 || last_override_level_graphics != setup.override_level_graphics) { +#if 0 + printf("CHANGED GFX: '%s' -> '%s'\n", + artwork.gfx_current_identifier, gfx_new_identifier); +#endif + +#if 0 int i; +#endif setLevelArtworkDir(artwork.gfx_first); ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); - for(i=0; iidentifier; +#endif last_override_level_graphics = setup.override_level_graphics; + + redraw_screen = TRUE; } if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 || @@ -526,6 +630,8 @@ void ReloadCustomArtwork() artwork.snd_current_identifier = snd_new_identifier; last_override_level_sounds = setup.override_level_sounds; + + redraw_screen = TRUE; } if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 || @@ -538,6 +644,17 @@ void ReloadCustomArtwork() artwork.mus_current_identifier = mus_new_identifier; last_override_level_music = setup.override_level_music; + + redraw_screen = TRUE; + } + + if (redraw_screen) + { + InitGfxBackground(); + + /* force redraw of (open or closed) door graphics */ + SetDoorState(DOOR_OPEN_ALL); + CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); } #if 0 @@ -545,492 +662,327 @@ void ReloadCustomArtwork() #endif } +void FreeGadgets() +{ + FreeLevelEditorGadgets(); + FreeGameButtons(); + FreeTapeButtons(); + FreeToolButtons(); + FreeScreenGadgets(); +} + void InitGadgets() { + static boolean gadgets_initialized = FALSE; + + if (gadgets_initialized) + FreeGadgets(); + CreateLevelEditorGadgets(); CreateGameButtons(); CreateTapeButtons(); CreateToolButtons(); CreateScreenGadgets(); + + gadgets_initialized = TRUE; } void InitElementInfo() { - int i, j; - static struct - { - int element; - int graphic; - } - element_to_graphic[] = - { - { EL_LEERRAUM, GFX_LEERRAUM }, - { EL_ERDREICH, GFX_ERDREICH }, - { EL_MAUERWERK, GFX_MAUERWERK }, - { EL_FELSBODEN, GFX_FELSBODEN }, - { EL_FELSBROCKEN, GFX_FELSBROCKEN }, - { EL_SCHLUESSEL, GFX_SCHLUESSEL }, - { EL_EDELSTEIN, GFX_EDELSTEIN }, - { EL_AUSGANG_ZU, GFX_AUSGANG_ZU }, - { EL_AUSGANG_ACT, GFX_AUSGANG_ACT }, - { EL_AUSGANG_AUF, GFX_AUSGANG_AUF }, - { EL_SPIELFIGUR, GFX_SPIELFIGUR }, - { EL_SPIELER1, GFX_SPIELER1 }, - { EL_SPIELER2, GFX_SPIELER2 }, - { EL_SPIELER3, GFX_SPIELER3 }, - { EL_SPIELER4, GFX_SPIELER4 }, - { EL_KAEFER, GFX_KAEFER }, - { EL_KAEFER_RIGHT, GFX_KAEFER_RIGHT }, - { EL_KAEFER_UP, GFX_KAEFER_UP }, - { EL_KAEFER_LEFT, GFX_KAEFER_LEFT }, - { EL_KAEFER_DOWN, GFX_KAEFER_DOWN }, - { EL_FLIEGER, GFX_FLIEGER }, - { EL_FLIEGER_RIGHT, GFX_FLIEGER_RIGHT }, - { EL_FLIEGER_UP, GFX_FLIEGER_UP }, - { EL_FLIEGER_LEFT, GFX_FLIEGER_LEFT }, - { EL_FLIEGER_DOWN, GFX_FLIEGER_DOWN }, - { EL_BUTTERFLY, GFX_BUTTERFLY }, - { EL_BUTTERFLY_RIGHT, GFX_BUTTERFLY_RIGHT }, - { EL_BUTTERFLY_UP, GFX_BUTTERFLY_UP }, - { EL_BUTTERFLY_LEFT, GFX_BUTTERFLY_LEFT }, - { EL_BUTTERFLY_DOWN, GFX_BUTTERFLY_DOWN }, - { EL_FIREFLY, GFX_FIREFLY }, - { EL_FIREFLY_RIGHT, GFX_FIREFLY_RIGHT }, - { EL_FIREFLY_UP, GFX_FIREFLY_UP }, - { EL_FIREFLY_LEFT, GFX_FIREFLY_LEFT }, - { EL_FIREFLY_DOWN, GFX_FIREFLY_DOWN }, - { EL_MAMPFER, GFX_MAMPFER }, - { EL_ROBOT, GFX_ROBOT }, - { EL_BETON, GFX_BETON }, - { EL_DIAMANT, GFX_DIAMANT }, - { EL_MORAST_LEER, GFX_MORAST_LEER }, - { EL_MORAST_VOLL, GFX_MORAST_VOLL }, - { EL_QUICKSAND_EMPTYING, GFX_MORAST_LEER }, - { EL_TROPFEN, GFX_TROPFEN }, - { EL_BOMBE, GFX_BOMBE }, - { EL_MAGIC_WALL_OFF, GFX_MAGIC_WALL_OFF }, - { EL_MAGIC_WALL_EMPTY, GFX_MAGIC_WALL_EMPTY }, - { EL_MAGIC_WALL_EMPTYING, GFX_MAGIC_WALL_EMPTY }, - { EL_MAGIC_WALL_FULL, GFX_MAGIC_WALL_FULL }, - { EL_MAGIC_WALL_DEAD, GFX_MAGIC_WALL_DEAD }, - { EL_SALZSAEURE, GFX_SALZSAEURE }, - { EL_AMOEBE_TOT, GFX_AMOEBE_TOT }, - { EL_AMOEBE_NASS, GFX_AMOEBE_NASS }, - { EL_AMOEBE_NORM, GFX_AMOEBE_NORM }, - { EL_AMOEBE_VOLL, GFX_AMOEBE_VOLL }, - { EL_AMOEBE_BD, GFX_AMOEBE_BD }, - { EL_AMOEBA2DIAM, GFX_AMOEBA2DIAM }, - { EL_AMOEBA_DRIPPING, GFX_AMOEBE_NASS }, - { EL_KOKOSNUSS, GFX_KOKOSNUSS }, - { EL_LIFE, GFX_LIFE }, - { EL_LIFE_ASYNC, GFX_LIFE_ASYNC }, - { EL_DYNAMITE_ACTIVE, GFX_DYNAMIT }, - { EL_BADEWANNE, GFX_BADEWANNE }, - { EL_BADEWANNE1, GFX_BADEWANNE1 }, - { EL_BADEWANNE2, GFX_BADEWANNE2 }, - { EL_BADEWANNE3, GFX_BADEWANNE3 }, - { EL_BADEWANNE4, GFX_BADEWANNE4 }, - { EL_BADEWANNE5, GFX_BADEWANNE5 }, - { EL_ABLENK_AUS, GFX_ABLENK_AUS }, - { EL_ABLENK_EIN, GFX_ABLENK_EIN }, - { EL_SCHLUESSEL1, GFX_SCHLUESSEL1 }, - { EL_SCHLUESSEL2, GFX_SCHLUESSEL2 }, - { EL_SCHLUESSEL3, GFX_SCHLUESSEL3 }, - { EL_SCHLUESSEL4, GFX_SCHLUESSEL4 }, - { EL_PFORTE1, GFX_PFORTE1 }, - { EL_PFORTE2, GFX_PFORTE2 }, - { EL_PFORTE3, GFX_PFORTE3 }, - { EL_PFORTE4, GFX_PFORTE4 }, - { EL_PFORTE1X, GFX_PFORTE1X }, - { EL_PFORTE2X, GFX_PFORTE2X }, - { EL_PFORTE3X, GFX_PFORTE3X }, - { EL_PFORTE4X, GFX_PFORTE4X }, - { EL_DYNAMITE_INACTIVE, GFX_DYNAMIT_AUS }, - { EL_PACMAN, GFX_PACMAN }, - { EL_PACMAN_RIGHT, GFX_PACMAN_RIGHT }, - { EL_PACMAN_UP, GFX_PACMAN_UP }, - { EL_PACMAN_LEFT, GFX_PACMAN_LEFT }, - { EL_PACMAN_DOWN, GFX_PACMAN_DOWN }, - { EL_UNSICHTBAR, GFX_UNSICHTBAR }, - { EL_ERZ_EDEL, GFX_ERZ_EDEL }, - { EL_ERZ_DIAM, GFX_ERZ_DIAM }, - { EL_BIRNE_AUS, GFX_BIRNE_AUS }, - { EL_BIRNE_EIN, GFX_BIRNE_EIN }, - { EL_ZEIT_VOLL, GFX_ZEIT_VOLL }, - { EL_ZEIT_LEER, GFX_ZEIT_LEER }, - { EL_MAUER_LEBT, GFX_MAUER_LEBT }, - { EL_MAUER_X, GFX_MAUER_X }, - { EL_MAUER_Y, GFX_MAUER_Y }, - { EL_MAUER_XY, GFX_MAUER_XY }, - { EL_EDELSTEIN_BD, GFX_EDELSTEIN_BD }, - { EL_EDELSTEIN_GELB, GFX_EDELSTEIN_GELB }, - { EL_EDELSTEIN_ROT, GFX_EDELSTEIN_ROT }, - { EL_EDELSTEIN_LILA, GFX_EDELSTEIN_LILA }, - { EL_ERZ_EDEL_BD, GFX_ERZ_EDEL_BD }, - { EL_ERZ_EDEL_GELB, GFX_ERZ_EDEL_GELB }, - { EL_ERZ_EDEL_ROT, GFX_ERZ_EDEL_ROT }, - { EL_ERZ_EDEL_LILA, GFX_ERZ_EDEL_LILA }, - { EL_MAMPFER2, GFX_MAMPFER2 }, - { EL_MAGIC_WALL_BD_OFF, GFX_MAGIC_WALL_BD_OFF }, - { EL_MAGIC_WALL_BD_EMPTY, GFX_MAGIC_WALL_BD_EMPTY }, - { EL_MAGIC_WALL_BD_EMPTYING, GFX_MAGIC_WALL_BD_EMPTY }, - { EL_MAGIC_WALL_BD_FULL, GFX_MAGIC_WALL_BD_FULL }, - { EL_MAGIC_WALL_BD_DEAD, GFX_MAGIC_WALL_BD_DEAD }, - { EL_DYNABOMB_ACTIVE_1, GFX_DYNABOMB }, - { EL_DYNABOMB_ACTIVE_2, GFX_DYNABOMB }, - { EL_DYNABOMB_ACTIVE_3, GFX_DYNABOMB }, - { EL_DYNABOMB_ACTIVE_4, GFX_DYNABOMB }, - { EL_DYNABOMB_NR, GFX_DYNABOMB_NR }, - { EL_DYNABOMB_SZ, GFX_DYNABOMB_SZ }, - { EL_DYNABOMB_XL, GFX_DYNABOMB_XL }, - { EL_SOKOBAN_OBJEKT, GFX_SOKOBAN_OBJEKT }, - { EL_SOKOBAN_FELD_LEER, GFX_SOKOBAN_FELD_LEER }, - { EL_SOKOBAN_FELD_VOLL, GFX_SOKOBAN_FELD_VOLL }, - { EL_MOLE, GFX_MOLE }, - { EL_PINGUIN, GFX_PINGUIN }, - { EL_SCHWEIN, GFX_SCHWEIN }, - { EL_DRACHE, GFX_DRACHE }, - { EL_SONDE, GFX_SONDE }, - { EL_PFEIL_LEFT, GFX_PFEIL_LEFT }, - { EL_PFEIL_RIGHT, GFX_PFEIL_RIGHT }, - { EL_PFEIL_UP, GFX_PFEIL_UP }, - { EL_PFEIL_DOWN, GFX_PFEIL_DOWN }, - { EL_SPEED_PILL, GFX_SPEED_PILL }, - { EL_SP_TERMINAL_ACTIVE, GFX_SP_TERMINAL }, - { EL_SP_BUG_ACTIVE, GFX_SP_BUG_ACTIVE }, - { EL_SP_ZONK, GFX_SP_ZONK }, - { EL_INVISIBLE_STEEL, GFX_INVISIBLE_STEEL }, - { EL_BLACK_ORB, GFX_BLACK_ORB }, - { EL_EM_GATE_1, GFX_EM_GATE_1 }, - { EL_EM_GATE_2, GFX_EM_GATE_2 }, - { EL_EM_GATE_3, GFX_EM_GATE_3 }, - { EL_EM_GATE_4, GFX_EM_GATE_4 }, - { EL_EM_GATE_1X, GFX_EM_GATE_1X }, - { EL_EM_GATE_2X, GFX_EM_GATE_2X }, - { EL_EM_GATE_3X, GFX_EM_GATE_3X }, - { EL_EM_GATE_4X, GFX_EM_GATE_4X }, - { EL_EM_KEY_1_FILE, GFX_EM_KEY_1 }, - { EL_EM_KEY_2_FILE, GFX_EM_KEY_2 }, - { EL_EM_KEY_3_FILE, GFX_EM_KEY_3 }, - { EL_EM_KEY_4_FILE, GFX_EM_KEY_4 }, - { EL_EM_KEY_1, GFX_EM_KEY_1 }, - { EL_EM_KEY_2, GFX_EM_KEY_2 }, - { EL_EM_KEY_3, GFX_EM_KEY_3 }, - { EL_EM_KEY_4, GFX_EM_KEY_4 }, - { EL_PEARL, GFX_PEARL }, - { EL_CRYSTAL, GFX_CRYSTAL }, - { EL_WALL_PEARL, GFX_WALL_PEARL }, - { EL_WALL_CRYSTAL, GFX_WALL_CRYSTAL }, - { EL_DOOR_WHITE, GFX_DOOR_WHITE }, - { EL_DOOR_WHITE_GRAY, GFX_DOOR_WHITE_GRAY }, - { EL_KEY_WHITE, GFX_KEY_WHITE }, - { EL_SHIELD_PASSIVE, GFX_SHIELD_PASSIVE }, - { EL_SHIELD_ACTIVE, GFX_SHIELD_ACTIVE }, - { EL_EXTRA_TIME, GFX_EXTRA_TIME }, - { EL_SWITCHGATE_OPEN, GFX_SWITCHGATE_OPEN }, - { EL_SWITCHGATE_CLOSED, GFX_SWITCHGATE_CLOSED }, - { EL_SWITCHGATE_SWITCH_1, GFX_SWITCHGATE_SWITCH_1 }, - { EL_SWITCHGATE_SWITCH_2, GFX_SWITCHGATE_SWITCH_2 }, - { EL_BELT1_LEFT, GFX_BELT1_LEFT }, - { EL_BELT1_MIDDLE, GFX_BELT1_MIDDLE }, - { EL_BELT1_RIGHT, GFX_BELT1_RIGHT }, - { EL_BELT1_SWITCH_LEFT, GFX_BELT1_SWITCH_LEFT }, - { EL_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE }, - { EL_BELT1_SWITCH_RIGHT, GFX_BELT1_SWITCH_RIGHT }, - { EL_BELT2_LEFT, GFX_BELT2_LEFT }, - { EL_BELT2_MIDDLE, GFX_BELT2_MIDDLE }, - { EL_BELT2_RIGHT, GFX_BELT2_RIGHT }, - { EL_BELT2_SWITCH_LEFT, GFX_BELT2_SWITCH_LEFT }, - { EL_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE }, - { EL_BELT2_SWITCH_RIGHT, GFX_BELT2_SWITCH_RIGHT }, - { EL_BELT3_LEFT, GFX_BELT3_LEFT }, - { EL_BELT3_MIDDLE, GFX_BELT3_MIDDLE }, - { EL_BELT3_RIGHT, GFX_BELT3_RIGHT }, - { EL_BELT3_SWITCH_LEFT, GFX_BELT3_SWITCH_LEFT }, - { EL_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE }, - { EL_BELT3_SWITCH_RIGHT, GFX_BELT3_SWITCH_RIGHT }, - { EL_BELT4_LEFT, GFX_BELT4_LEFT }, - { EL_BELT4_MIDDLE, GFX_BELT4_MIDDLE }, - { EL_BELT4_RIGHT, GFX_BELT4_RIGHT }, - { EL_BELT4_SWITCH_LEFT, GFX_BELT4_SWITCH_LEFT }, - { EL_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE }, - { EL_BELT4_SWITCH_RIGHT, GFX_BELT4_SWITCH_RIGHT }, - { EL_LANDMINE, GFX_LANDMINE }, - { EL_ENVELOPE, GFX_ENVELOPE }, - { EL_LIGHT_SWITCH_OFF, GFX_LIGHT_SWITCH_OFF }, - { EL_LIGHT_SWITCH_ON, GFX_LIGHT_SWITCH_ON }, - { EL_SIGN_EXCLAMATION, GFX_SIGN_EXCLAMATION }, - { EL_SIGN_RADIOACTIVITY, GFX_SIGN_RADIOACTIVITY }, - { EL_SIGN_STOP, GFX_SIGN_STOP }, - { EL_SIGN_WHEELCHAIR, GFX_SIGN_WHEELCHAIR }, - { EL_SIGN_PARKING, GFX_SIGN_PARKING }, - { EL_SIGN_ONEWAY, GFX_SIGN_ONEWAY }, - { EL_SIGN_HEART, GFX_SIGN_HEART }, - { EL_SIGN_TRIANGLE, GFX_SIGN_TRIANGLE }, - { EL_SIGN_ROUND, GFX_SIGN_ROUND }, - { EL_SIGN_EXIT, GFX_SIGN_EXIT }, - { EL_SIGN_YINYANG, GFX_SIGN_YINYANG }, - { EL_SIGN_OTHER, GFX_SIGN_OTHER }, - { EL_MOLE_LEFT, GFX_MOLE_LEFT }, - { EL_MOLE_RIGHT, GFX_MOLE_RIGHT }, - { EL_MOLE_UP, GFX_MOLE_UP }, - { EL_MOLE_DOWN, GFX_MOLE_DOWN }, - { EL_STEEL_SLANTED, GFX_STEEL_SLANTED }, - { EL_SAND_INVISIBLE, GFX_SAND_INVISIBLE }, - { EL_DX_UNKNOWN_15, GFX_DX_UNKNOWN_15 }, - { EL_DX_UNKNOWN_42, GFX_DX_UNKNOWN_42 }, - { EL_TIMEGATE_OPEN, GFX_TIMEGATE_OPEN }, - { EL_TIMEGATE_CLOSED, GFX_TIMEGATE_CLOSED }, - { EL_TIMEGATE_SWITCH_ON, GFX_TIMEGATE_SWITCH }, - { EL_TIMEGATE_SWITCH_OFF, GFX_TIMEGATE_SWITCH }, - { EL_BALLOON, GFX_BALLOON }, - { EL_BALLOON_SEND_LEFT, GFX_BALLOON_SEND_LEFT }, - { EL_BALLOON_SEND_RIGHT, GFX_BALLOON_SEND_RIGHT }, - { EL_BALLOON_SEND_UP, GFX_BALLOON_SEND_UP }, - { EL_BALLOON_SEND_DOWN, GFX_BALLOON_SEND_DOWN }, - { EL_BALLOON_SEND_ANY, GFX_BALLOON_SEND_ANY }, - { EL_EMC_STEEL_WALL_1, GFX_EMC_STEEL_WALL_1 }, - { EL_EMC_STEEL_WALL_2, GFX_EMC_STEEL_WALL_2 }, - { EL_EMC_STEEL_WALL_3, GFX_EMC_STEEL_WALL_3 }, - { EL_EMC_STEEL_WALL_4, GFX_EMC_STEEL_WALL_4 }, - { EL_EMC_WALL_1, GFX_EMC_WALL_1 }, - { EL_EMC_WALL_2, GFX_EMC_WALL_2 }, - { EL_EMC_WALL_3, GFX_EMC_WALL_3 }, - { EL_EMC_WALL_4, GFX_EMC_WALL_4 }, - { EL_EMC_WALL_5, GFX_EMC_WALL_5 }, - { EL_EMC_WALL_6, GFX_EMC_WALL_6 }, - { EL_EMC_WALL_7, GFX_EMC_WALL_7 }, - { EL_EMC_WALL_8, GFX_EMC_WALL_8 }, - { EL_TUBE_CROSS, GFX_TUBE_CROSS }, - { EL_TUBE_VERTICAL, GFX_TUBE_VERTICAL }, - { EL_TUBE_HORIZONTAL, GFX_TUBE_HORIZONTAL }, - { EL_TUBE_VERT_LEFT, GFX_TUBE_VERT_LEFT }, - { EL_TUBE_VERT_RIGHT, GFX_TUBE_VERT_RIGHT }, - { EL_TUBE_HORIZ_UP, GFX_TUBE_HORIZ_UP }, - { EL_TUBE_HORIZ_DOWN, GFX_TUBE_HORIZ_DOWN }, - { EL_TUBE_LEFT_UP, GFX_TUBE_LEFT_UP }, - { EL_TUBE_LEFT_DOWN, GFX_TUBE_LEFT_DOWN }, - { EL_TUBE_RIGHT_UP, GFX_TUBE_RIGHT_UP }, - { EL_TUBE_RIGHT_DOWN, GFX_TUBE_RIGHT_DOWN }, - { EL_SPRING, GFX_SPRING }, - { EL_SPRING_MOVING, GFX_SPRING }, - { EL_TRAP_INACTIVE, GFX_TRAP_INACTIVE }, - { EL_TRAP_ACTIVE, GFX_TRAP_ACTIVE }, - { EL_BD_WALL, GFX_BD_WALL }, - { EL_BD_ROCK, GFX_BD_ROCK }, - { EL_DX_SUPABOMB, GFX_DX_SUPABOMB }, - { EL_SP_MURPHY_CLONE, GFX_SP_MURPHY_CLONE }, - { -1, -1 } - }; + int i, act, dir; - static struct + /* set values to -1 to identify later as "uninitialized" values */ + for (i=0; i -1) { - int element = element_to_graphic[i].element; - int graphic = element_to_graphic[i].graphic; + int element = element_to_graphic[i].element; + int direction = element_to_graphic[i].direction; + int action = element_to_graphic[i].action; + int graphic = element_to_graphic[i].graphic; + + if (action > -1) + action = graphics_action_mapping[action]; + else + action = GFX_ACTION_DEFAULT; + + if (direction > -1) + { + direction = MV_DIR_BIT(direction); + + element_info[element].direction_graphic[action][direction] = graphic; + } + else + element_info[element].graphic[action] = graphic; - element_info[element].graphic[GFX_ACTION_DEFAULT] = graphic; i++; } - /* this initializes special graphics for left/right/up/down directions */ - i = 0; - while (element_to_direction_graphic[i].element > -1) + /* now set all '-1' values to element specific default values */ + for (i=0; i -1) + { + int action = element_to_graphic[i].action; + int graphic = element_to_graphic[i].graphic; + + if (action == -1) + action = GFX_ACTION_DEFAULT; + + gfx_action[graphic] = action; + + i++; + } + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + if (clipmasks_initialized) { - /* always start with reliable default values */ - graphic_info[i].bitmap = NULL; - graphic_info[i].src_x = 0; - graphic_info[i].src_y = 0; + for (i=0; iwidth : TILEX) / TILEX; + int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY; int *parameter = image_files[i].parameter; - /* always start with reliable default values */ - new_graphic_info[i].bitmap = getBitmapFromImageID(i); + new_graphic_info[i].bitmap = src_bitmap; + new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX; new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY; + new_graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET]; + new_graphic_info[i].offset_y = 0; - new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES]; + /* animation frames are ordered vertically instead of horizontally */ + if (parameter[GFX_ARG_VERTICAL]) + { + new_graphic_info[i].offset_x = 0; + new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET]; + } + + /* optionally, the x and y offset of frames can be specified directly */ + if (parameter[GFX_ARG_XOFFSET] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].offset_x = parameter[GFX_ARG_XOFFSET]; + if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET]; + + /* automatically determine correct number of frames, if not defined */ + if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES]; + else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL]) + new_graphic_info[i].anim_frames = num_xtiles; + else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL]) + new_graphic_info[i].anim_frames = num_ytiles; + else + new_graphic_info[i].anim_frames = 1; new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY]; if (new_graphic_info[i].anim_delay == 0) /* delay must be at least 1 */ new_graphic_info[i].anim_delay = 1; - /* basically, animation can be either normal or reverse direction */ - if (parameter[GFX_ARG_REVERSE]) - new_graphic_info[i].anim_mode = ANIM_REVERSE; + /* set mode for animation frame order */ + if (parameter[GFX_ARG_MODE_LOOP]) + new_graphic_info[i].anim_mode = ANIM_LOOP; + else if (parameter[GFX_ARG_MODE_LINEAR]) + new_graphic_info[i].anim_mode = ANIM_LINEAR; + else if (parameter[GFX_ARG_MODE_PINGPONG]) + new_graphic_info[i].anim_mode = ANIM_PINGPONG; + else if (parameter[GFX_ARG_MODE_PINGPONG2]) + new_graphic_info[i].anim_mode = ANIM_PINGPONG2; + else if (parameter[GFX_ARG_MODE_RANDOM]) + new_graphic_info[i].anim_mode = ANIM_RANDOM; + else if (new_graphic_info[i].anim_frames > 1) + new_graphic_info[i].anim_mode = ANIM_LOOP; else - new_graphic_info[i].anim_mode = ANIM_NORMAL; + new_graphic_info[i].anim_mode = ANIM_NONE; - /* additionally, animation can be either pingpong or pingpong2 layout */ - if (parameter[GFX_ARG_PINGPONG]) - new_graphic_info[i].anim_mode |= ANIM_PINGPONG; - else if (parameter[GFX_ARG_PINGPONG2]) - new_graphic_info[i].anim_mode |= ANIM_PINGPONG2; + /* set additional flag to play animation frames in reverse order */ + if (parameter[GFX_ARG_MODE_REVERSE]) + new_graphic_info[i].anim_mode |= ANIM_REVERSE; + + /* set first frame of animation after determining animation mode */ + new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME]; + + /* automatically determine correct start frame, if not defined */ + if (parameter[GFX_ARG_START_FRAME] == GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].anim_start_frame = 0; + else if (new_graphic_info[i].anim_mode & ANIM_REVERSE) + new_graphic_info[i].anim_start_frame = + new_graphic_info[i].anim_frames - parameter[GFX_ARG_START_FRAME] - 1; /* animation synchronized with global frame counter, not move position */ new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC]; - new_graphic_info[i].anim_vertical = parameter[GFX_ARG_VERTICAL]; + /* set global_sync for all animations with undefined "animation action" */ + if (parameter[GFX_ARG_GLOBAL_SYNC] == GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].anim_global_sync = + (gfx_action[i] == GFX_ACTION_DEFAULT ? TRUE : FALSE); + + /* "linear" animations are never globally synchronized */ + if (parameter[GFX_ARG_MODE_LINEAR]) + new_graphic_info[i].anim_global_sync = FALSE; + + /* now check if no animation frames are outside of the loaded image */ + + if (new_graphic_info[i].bitmap == NULL) + continue; /* skip check for optional images that are undefined */ + + first_frame = 0; + getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); + if (src_x < 0 || src_y < 0 || + src_x + TILEX > src_bitmap->width || + src_y + TILEY > src_bitmap->height) + { + Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN, "- config file: '%s'", + getImageConfigFilename()); + Error(ERR_RETURN, "- config token: '%s'", + getTokenFromImageID(i)); + Error(ERR_RETURN, "- image file: '%s'", + src_bitmap->source_filename); + Error(ERR_EXIT, "error: first animation frame out of bounds (%d,%d)", + src_x, src_y); + } + + last_frame = new_graphic_info[i].anim_frames - 1; + getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y); + if (src_x < 0 || src_y < 0 || + src_x + TILEX > src_bitmap->width || + src_y + TILEY > src_bitmap->height) + { + Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN, "- config file: '%s'", + getImageConfigFilename()); + Error(ERR_RETURN, "- config token: '%s'", + getTokenFromImageID(i)); + Error(ERR_RETURN, "- image file: '%s'", + src_bitmap->source_filename); + Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)", + last_frame, src_x, src_y); + } + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + /* currently we need only a tile clip mask from the first frame */ + getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); + + if (copy_clipmask_gc == None) + { + clip_gc_values.graphics_exposures = False; + clip_gc_valuemask = GCGraphicsExposures; + copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask, + clip_gc_valuemask, &clip_gc_values); + } + + new_graphic_info[i].clip_mask = + XCreatePixmap(display, window->drawable, TILEX, TILEY, 1); + + src_pixmap = src_bitmap->clip_mask; + XCopyArea(display, src_pixmap, new_graphic_info[i].clip_mask, + copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0); + + clip_gc_values.graphics_exposures = False; + clip_gc_values.clip_mask = new_graphic_info[i].clip_mask; + clip_gc_valuemask = GCGraphicsExposures | GCClipMask; + new_graphic_info[i].clip_gc = + XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values); +#endif } -#if 0 - printf("D> %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; +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + if (copy_clipmask_gc) + XFreeGC(display, copy_clipmask_gc); #endif + + clipmasks_initialized = TRUE; } static void InitSoundInfo() @@ -1047,54 +999,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, @@ -1103,13 +1055,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, @@ -1119,45 +1071,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, @@ -1176,26 +1128,30 @@ 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_INVISIBLE_STEELWALL_ACTIVE, + EL_INVISIBLE_WALL, + EL_INVISIBLE_WALL_ACTIVE, + 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, @@ -1208,38 +1164,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, @@ -1248,13 +1204,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, @@ -1264,13 +1220,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, @@ -1282,21 +1238,22 @@ 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_INVISIBLE_STEELWALL_ACTIVE, + 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, @@ -1309,28 +1266,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, @@ -1339,13 +1296,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, @@ -1355,27 +1312,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, @@ -1384,7 +1341,7 @@ void InitElementProperties() EL_SP_CHIP_UPPER, EL_SP_CHIP_LOWER, EL_SPEED_PILL, - EL_STEEL_SLANTED, + EL_STEELWALL_SLANTED, EL_PEARL, EL_CRYSTAL }; @@ -1392,12 +1349,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, @@ -1407,33 +1364,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, @@ -1453,42 +1410,46 @@ 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_INVISIBLE_STEELWALL_ACTIVE, + EL_INVISIBLE_WALL, + EL_INVISIBLE_WALL_ACTIVE, + 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, @@ -1501,27 +1462,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, @@ -1534,57 +1495,57 @@ 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, - EL_SPRING_MOVING + EL_SPRING }; static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move); 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, @@ -1594,28 +1555,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 }; @@ -1623,26 +1584,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 }; @@ -1650,119 +1611,120 @@ 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_PLAYER1, + 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_PLAYER1, + 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_STEELWALL, + EL_INVISIBLE_WALL, + EL_INVISIBLE_SAND, + 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, @@ -1795,20 +1757,18 @@ 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_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, @@ -1821,40 +1781,40 @@ 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_DYNABOMB_ACTIVE_1, - EL_DYNABOMB_ACTIVE_2, - EL_DYNABOMB_ACTIVE_3, - EL_DYNABOMB_ACTIVE_4, + EL_DYNAMITE, + EL_DYNABOMB_PLAYER1_ACTIVE, + EL_DYNABOMB_PLAYER2_ACTIVE, + EL_DYNABOMB_PLAYER3_ACTIVE, + EL_DYNABOMB_PLAYER4_ACTIVE, 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, @@ -1866,12 +1826,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 }; @@ -1879,14 +1839,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, @@ -1898,31 +1858,32 @@ void InitElementProperties() static int ep_player[] = { - EL_SPIELFIGUR, - EL_SPIELER1, - EL_SPIELER2, - EL_SPIELER3, - EL_SPIELER4 + 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_SP_BUGGY_BASE_ACTIVATING, + EL_TRAP, + EL_INVISIBLE_SAND, + EL_INVISIBLE_SAND_ACTIVE }; static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable); @@ -1935,7 +1896,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, @@ -1953,7 +1915,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, @@ -1969,7 +1931,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 }; @@ -1977,14 +1939,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, @@ -2014,13 +1976,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, @@ -2031,56 +1993,73 @@ void InitElementProperties() static int ep_active_bomb[] = { EL_DYNAMITE_ACTIVE, - EL_DYNABOMB_ACTIVE_1, - EL_DYNABOMB_ACTIVE_2, - EL_DYNABOMB_ACTIVE_3, - EL_DYNABOMB_ACTIVE_4 + EL_DYNABOMB_PLAYER1_ACTIVE, + EL_DYNABOMB_PLAYER2_ACTIVE, + EL_DYNABOMB_PLAYER3_ACTIVE, + EL_DYNABOMB_PLAYER4_ACTIVE }; static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb); 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, @@ -2125,6 +2104,7 @@ void InitElementProperties() static long ep2_bit[] = { EP_BIT_BELT, + EP_BIT_BELT_ACTIVE, EP_BIT_BELT_SWITCH, EP_BIT_TUBE }; @@ -2165,6 +2145,7 @@ void InitElementProperties() static int *ep2_array[] = { ep_belt, + ep_belt_active, ep_belt_switch, ep_tube }; @@ -2205,32 +2186,33 @@ void InitElementProperties() static int *ep2_num[] = { &ep_belt_num, + &ep_belt_active_num, &ep_belt_switch_num, &ep_tube_num }; static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *); static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *); - for(i=0; i