X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=4da3ddb1366698fa4530b86d139e6bf3a152af72;hb=077ee3fdd3632045b35984a998b9efecc437beb6;hp=134cf74aeadfee1f092b95fb9496cb1adc9b2b09;hpb=33df7a5ca87e883c2b718171fd7d05c22fc0353f;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 134cf74a..4da3ddb1 100644 --- a/src/init.c +++ b/src/init.c @@ -1,603 +1,494 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1995-2001 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* init.c * +* init.c * ***********************************************************/ +#include "libgame/libgame.h" + #include "init.h" -#include "misc.h" -#include "sound.h" +#include "events.h" #include "screens.h" +#include "editor.h" +#include "game.h" +#include "tape.h" #include "tools.h" #include "files.h" -#include "joystick.h" -#include "gfxloader.h" - -#include - -#ifdef DEBUG -/* -#define DEBUG_TIMING -*/ -#endif +#include "network.h" +#include "netserv.h" +#include "cartoons.h" +#include "config.h" -struct PictureFileInfo +static char *image_filename[NUM_PICTURES] = { - char *picture_filename; - BOOL picture_with_mask; -}; - -struct IconFileInfo -{ - char *picture_filename; - char *picturemask_filename; -}; - -static int sound_process_id = 0; - -static void InitLevelAndPlayerInfo(void); -static void InitDisplay(int, char **); + "RocksScreen.pcx", + "RocksDoor.pcx", + "RocksHeroes.pcx", + "RocksToons.pcx", + "RocksSP.pcx", + "RocksDC.pcx", + "RocksMore.pcx", + "RocksFont.pcx", + "RocksFont2.pcx", + "RocksFont3.pcx" +}; + +static void InitSetup(void); +static void InitPlayerInfo(void); +static void InitLevelInfo(void); +static void InitArtworkInfo(void); +static void InitLevelArtworkInfo(void); +static void InitNetworkServer(void); +static void InitMixer(void); static void InitSound(void); -static void InitSoundProcess(void); -static void InitWindow(int, char **); static void InitGfx(void); -static void LoadGfx(int, struct PictureFileInfo *); +static void InitGfxBackground(void); +static void InitGadgets(void); static void InitElementProperties(void); +static void Execute_Debug_Command(char *); -void OpenAll(int argc, char *argv[]) +void OpenAll(void) { - InitLevelAndPlayerInfo(); + if (options.debug_command) + { + Execute_Debug_Command(options.debug_command); + + exit(0); + } + + if (options.serveronly) + { +#if defined(PLATFORM_UNIX) + NetworkServer(options.server_port, options.serveronly); +#else + Error(ERR_WARN, "networking only supported in Unix version"); +#endif + exit(0); /* never reached */ + } + + InitProgramInfo(UNIX_USERDATA_DIRECTORY, + PROGRAM_TITLE_STRING, getWindowTitleString(), + ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME, + MSDOS_POINTER_FILENAME, + COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL); + + InitSetup(); + InitPlayerInfo(); + InitArtworkInfo(); /* needed before loading gfx, sound & music */ InitCounter(); - InitSound(); - InitSoundProcess(); - InitJoystick(); + InitMixer(); + InitJoysticks(); InitRND(NEW_RANDOMIZE); - signal(SIGINT, CloseAll); - signal(SIGTERM, CloseAll); - - InitDisplay(argc, argv); - InitWindow(argc, argv); + InitVideoDisplay(); + InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, + setup.fullscreen); - XMapWindow(display, window); - XFlush(display); + InitEventFilter(FilterMouseMotionEvents); InitGfx(); - InitElementProperties(); + InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ + + InitLevelInfo(); + InitLevelArtworkInfo(); + InitGadgets(); /* needs to know number of level series */ + InitSound(); /* needs to know current level directory */ + + InitGfxBackground(); + InitToons(); DrawMainMenu(); + + InitNetworkServer(); } -void InitLevelAndPlayerInfo() +void InitSetup() { - if (!LoadLevelInfo()) /* global level info */ - CloseAll(); - - LoadPlayerInfo(PLAYER_SETUP); /* global setup info */ - LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */ + LoadSetup(); /* global setup info */ } -void InitSound() +void InitPlayerInfo() { int i; - if (sound_status==SOUND_OFF) - return; + /* choose default local player */ + local_player = &stored_player[0]; - if (access(sound_device_name,W_OK)<0) - { - fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname); - sound_status=SOUND_OFF; - return; - } + for (i=0; iconnected = TRUE; +} - close(sound_device); - sound_status=SOUND_AVAILABLE; +void InitLevelInfo() +{ + LoadLevelInfo(); /* global level info */ + LoadLevelSetup_LastSeries(); /* last played series info */ + LoadLevelSetup_SeriesInfo(); /* last played level info */ +} -#ifdef VOXWARE - sound_loops_allowed = TRUE; - sound_loops_on = TRUE; -#endif +void InitArtworkInfo() +{ + LoadArtworkInfo(); +} - for(i=0;iname); + InitReloadMusic(artwork.mus_current->name); - joystick_status = JOYSTICK_AVAILABLE; - LoadJoystickData(); + /* initialize sound effect lookup table for element actions */ + InitGameSound(); } -void InitDisplay(int argc, char *argv[]) +static void InitTileClipmasks() { - char *display_name = NULL; - int i; +#if defined(TARGET_X11) + XGCValues clip_gc_values; + unsigned long clip_gc_valuemask; - /* get X server to connect to, if given as an argument */ - for (i=1;idrawable, clip_gc_valuemask, &clip_gc_values); + + for(i=0; iclip_mask) + { + clip_gc_values.graphics_exposures = False; + clip_gc_values.clip_mask = pix[i]->clip_mask; + clip_gc_valuemask = GCGraphicsExposures | GCClipMask; + pix[i]->stored_clip_gc = XCreateGC(display, window->drawable, + clip_gc_valuemask, &clip_gc_values); + } } - size_hints.flags = PSize | PMinSize | PMaxSize; - size_hints.width = size_hints.min_width = size_hints.max_width = width; - size_hints.height = size_hints.min_height = size_hints.max_height = height; +#if defined(TARGET_X11_NATIVE) - if (!XStringListToTextProperty(&window_name, 1, &windowName)) - { - fprintf(stderr, "%s: structure allocation for windowName failed.\n", - progname); - exit(-1); - } + /* create graphic context structures needed for clipping */ + clip_gc_values.graphics_exposures = False; + clip_gc_valuemask = GCGraphicsExposures; + copy_clipmask_gc = + XCreateGC(display, pix[PIX_BACK]->clip_mask, + clip_gc_valuemask, &clip_gc_values); - if (!XStringListToTextProperty(&icon_name, 1, &iconName)) + /* create only those clipping Pixmaps we really need */ + for(i=0; tile_needs_clipping[i].start>=0; i++) { - fprintf(stderr, "%s: structure allocation for iconName failed.\n", - progname); - exit(-1); + int j; + + for(j=0; jclip_mask; + + tile_clipmask[tile] = XCreatePixmap(display, window->drawable, + TILEX, TILEY, 1); + + XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc, + src_x, src_y, TILEX, TILEY, 0, 0); + } } - wm_hints.initial_state = NormalState; - wm_hints.input = True; - wm_hints.icon_pixmap = icon_pixmap; - wm_hints.icon_mask = iconmask_pixmap; - wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint; - - class_hints.res_name = progname; - class_hints.res_class = "Rocks'n'Diamonds"; - - XSetWMProperties(display, window, &windowName, &iconName, - argv, argc, &size_hints, &wm_hints, - &class_hints); - - XFree(windowName.value); - XFree(iconName.value); - - /* Select event types wanted */ - window_event_mask = ExposureMask | StructureNotifyMask | FocusChangeMask | - ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | - KeyPressMask | KeyReleaseMask; - XSelectInput(display, window, window_event_mask); - - /* create GC for drawing with window depth */ - gc_values.graphics_exposures = False; - gc_values.foreground = pen_bg; - gc_values.background = pen_bg; - gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground; - gc = XCreateGC(display, window, gc_valuemask, &gc_values); + XFreeGC(display, copy_clipmask_gc); + +#endif /* TARGET_X11_NATIVE */ +#endif /* TARGET_X11 */ } -void DrawInitText(char *text, int ypos, int color) +void FreeTileClipmasks() { - if (display && window && pix[PIX_SMALLFONT]) +#if defined(TARGET_X11) + int i; + + for(i=0; istored_clip_gc) + { + XFreeGC(display, pix[i]->stored_clip_gc); + pix[i]->stored_clip_gc = None; + } + } +#endif /* TARGET_X11 */ } void InitGfx() { - int i,j; - XGCValues clip_gc_values; - unsigned long clip_gc_valuemask; - static struct PictureFileInfo pic[NUM_PICTURES] = - { - { "RocksScreen", TRUE }, - { "RocksDoor", TRUE }, - { "RocksHeroes", TRUE }, - { "RocksToons", TRUE }, - { "RocksFont", FALSE }, - { "RocksFont2", FALSE } - }; - -#ifdef DEBUG_TIMING - long count1, count2; - count1 = Counter(); -#endif + int i; - LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]); - DrawInitText(WINDOWTITLE_STRING,20,FC_YELLOW); - DrawInitText(COPYRIGHT_STRING,50,FC_RED); - DrawInitText("Loading graphics:",120,FC_GREEN); + /* initialize some global variables */ + global.frames_per_second = 0; + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; - for(i=0;ipicture_filename) + if (leveldir_current_filename != leveldir_current->filename) { - sprintf(basefilename,"%s%s",pic->picture_filename,picture_ext); - DrawInitText(basefilename,150,FC_YELLOW); - sprintf(filename,"%s/%s",GFX_PATH,basefilename); - -#ifdef DEBUG_TIMING - count1 = Counter(); -#endif - -#ifdef XPM_INCLUDE_FILE - - xpm_att[pos].valuemask = XpmCloseness; - xpm_att[pos].closeness = 20000; - xpm_err = XpmReadFileToPixmap(display,window,filename, - &pix[pos],&shapemask,&xpm_att[pos]); - switch(xpm_err) - { - case XpmOpenFailed: - fprintf(stderr,"Cannot open Xpm file '%s' !\n",filename); - CloseAll(); - exit(-1); - case XpmFileInvalid: - fprintf(stderr,"Invalid Xpm file '%s'!\n",filename); - CloseAll(); - exit(-1); - case XpmNoMemory: - fprintf(stderr,"Not enough memory for Xpm file '%s'!\n",filename); - CloseAll(); - exit(1); - case XpmColorFailed: - fprintf(stderr,"Can't get colors for Xpm file '%s'!\n",filename); - CloseAll(); - exit(-1); - default: - break; - } + char *filename_old = leveldir_current_filename; + char *filename_new = leveldir_current->filename; + + /* force reload of custom artwork after new level series was selected, + but reload only that part of the artwork that really has changed */ + if (getTreeInfoFromFilename(artwork.gfx_first, filename_old) != + getTreeInfoFromFilename(artwork.gfx_first, filename_new)) + artwork.graphics_set_current_name = NULL; + if (getTreeInfoFromFilename(artwork.snd_first, filename_old) != + getTreeInfoFromFilename(artwork.snd_first, filename_new)) + artwork.sounds_set_current_name = NULL; + if (getTreeInfoFromFilename(artwork.mus_first, filename_new) != + getTreeInfoFromFilename(artwork.mus_first, filename_new)) + artwork.music_set_current_name = NULL; + + leveldir_current_filename = leveldir_current->filename; + } -#else + if (artwork.graphics_set_current_name != artwork.gfx_current->name || + last_override_level_graphics != setup.override_level_graphics) + { + int i; - gif_err = Read_GIF_to_Pixmap(display,filename,&pix[pos]); + ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); - switch(gif_err) + for(i=0; iname; + last_override_level_graphics = setup.override_level_graphics; } - /* zugehörige Maske laden (wenn vorhanden) */ - if (pic->picture_with_mask) + if (artwork.sounds_set_current_name != artwork.snd_current->name || + last_override_level_sounds != setup.override_level_sounds) { - sprintf(basefilename,"%s%s",pic->picture_filename,picturemask_ext); - DrawInitText(basefilename,150,FC_YELLOW); - sprintf(filename,"%s/%s",GFX_PATH,basefilename); - -#ifdef DEBUG_TIMING - count1 = Counter(); -#endif + InitReloadSounds(artwork.snd_current->name); -#ifdef XPM_INCLUDE_FILE - - xbm_err = XReadBitmapFile(display,window,filename, - &width,&height,&clipmask[pos],&hot_x,&hot_y); - switch(xbm_err) - { - case BitmapSuccess: - break; - case BitmapOpenFailed: - fprintf(stderr,"Bitmap file open failed on '%s' !\n",filename); - CloseAll(); - exit(-1); - break; - case BitmapFileInvalid: - fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename); - CloseAll(); - exit(-1); - break; - case BitmapNoMemory: - fprintf(stderr,"No memory for file '%s' !\n",filename); - CloseAll(); - exit(-1); - break; - default: - break; - } - -#else - - ilbm_err = Read_ILBM_to_Bitmap(display,filename,&clipmask[pos]); - - switch(ilbm_err) - { - case ILBM_Success: - break; - case ILBM_OpenFailed: - fprintf(stderr,"Cannot open ILBM file '%s' !\n",filename); - CloseAll(); - exit(-1); - case ILBM_ReadFailed: - fprintf(stderr,"Cannot read ILBM file '%s' !\n",filename); - CloseAll(); - exit(-1); - case ILBM_FileInvalid: - fprintf(stderr,"Invalid ILBM file '%s'!\n",filename); - CloseAll(); - exit(-1); - case ILBM_NoMemory: - fprintf(stderr,"Not enough memory for ILBM file '%s'!\n",filename); - CloseAll(); - exit(1); - default: - break; - } - -#endif + artwork.sounds_set_current_name = artwork.snd_current->name; + last_override_level_sounds = setup.override_level_sounds; + } -#ifdef DEBUG_TIMING - count2 = Counter(); - printf("LOADING %s IN %.2f SECONDS\n", - filename,(float)(count2-count1)/100.0); -#endif + if (artwork.music_set_current_name != artwork.mus_current->name || + last_override_level_music != setup.override_level_music) + { + InitReloadMusic(artwork.mus_current->name); - if (!clipmask[pos]) - { - fprintf(stderr, "%s: cannot read graphics file '%s'.\n", - progname,filename); - CloseAll(); - exit(-1); - } + artwork.music_set_current_name = artwork.mus_current->name; + last_override_level_music = setup.override_level_music; } } +void InitGadgets() +{ + CreateLevelEditorGadgets(); + CreateGameButtons(); + CreateTapeButtons(); + CreateToolButtons(); + CreateScreenGadgets(); +} + void InitElementProperties() { int i,j; @@ -609,7 +500,7 @@ void InitElementProperties() EL_AMOEBE_VOLL, EL_AMOEBE_BD }; - static int ep_amoebalive_num = sizeof(ep_amoebalive)/sizeof(int); + static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive); static int ep_amoeboid[] = { @@ -619,16 +510,20 @@ void InitElementProperties() EL_AMOEBE_VOLL, EL_AMOEBE_BD }; - static int ep_amoeboid_num = sizeof(ep_amoeboid)/sizeof(int); + static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid); static int ep_schluessel[] = { EL_SCHLUESSEL1, EL_SCHLUESSEL2, EL_SCHLUESSEL3, - EL_SCHLUESSEL4 + EL_SCHLUESSEL4, + EL_EM_KEY_1, + EL_EM_KEY_2, + EL_EM_KEY_3, + EL_EM_KEY_4 }; - static int ep_schluessel_num = sizeof(ep_schluessel)/sizeof(int); + static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel); static int ep_pforte[] = { @@ -639,15 +534,46 @@ void InitElementProperties() EL_PFORTE1X, EL_PFORTE2X, EL_PFORTE3X, - EL_PFORTE4X + 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_SWITCHGATE_OPEN, + EL_SWITCHGATE_OPENING, + EL_SWITCHGATE_CLOSED, + EL_SWITCHGATE_CLOSING, + EL_TIMEGATE_OPEN, + EL_TIMEGATE_OPENING, + EL_TIMEGATE_CLOSED, + EL_TIMEGATE_CLOSING, + EL_TUBE_CROSS, + EL_TUBE_VERTICAL, + EL_TUBE_HORIZONTAL, + EL_TUBE_VERT_LEFT, + EL_TUBE_VERT_RIGHT, + EL_TUBE_HORIZ_UP, + EL_TUBE_HORIZ_DOWN, + EL_TUBE_LEFT_UP, + EL_TUBE_LEFT_DOWN, + EL_TUBE_RIGHT_UP, + EL_TUBE_RIGHT_DOWN }; - static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int); + static int ep_pforte_num = SIZEOF_ARRAY_INT(ep_pforte); static int ep_solid[] = { EL_BETON, EL_MAUERWERK, EL_MAUER_LEBT, + EL_MAUER_X, + EL_MAUER_Y, + EL_MAUER_XY, + EL_BD_WALL, EL_FELSBODEN, EL_AUSGANG_ZU, EL_AUSGANG_ACT, @@ -659,23 +585,132 @@ void InitElementProperties() EL_AMOEBE_BD, EL_MORAST_VOLL, EL_MORAST_LEER, - EL_SIEB_VOLL, - EL_SIEB_LEER, - EL_SIEB_TOT, - EL_SIEB2_VOLL, - EL_SIEB2_LEER, - EL_SIEB2_TOT, + EL_QUICKSAND_FILLING, + EL_QUICKSAND_EMPTYING, + EL_MAGIC_WALL_OFF, + EL_MAGIC_WALL_EMPTY, + 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_BADEWANNE5, + EL_SP_CHIP_SINGLE, + EL_SP_CHIP_LEFT, + EL_SP_CHIP_RIGHT, + EL_SP_CHIP_UPPER, + EL_SP_CHIP_LOWER, + EL_SP_HARD_GRAY, + EL_SP_HARD_GREEN, + EL_SP_HARD_BLUE, + EL_SP_HARD_RED, + EL_SP_HARD_YELLOW, + EL_SP_HARD_BASE1, + EL_SP_HARD_BASE2, + EL_SP_HARD_BASE3, + EL_SP_HARD_BASE4, + EL_SP_HARD_BASE5, + 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_SIGN_EXCLAMATION, + EL_SIGN_RADIOACTIVITY, + EL_SIGN_STOP, + EL_SIGN_WHEELCHAIR, + EL_SIGN_PARKING, + EL_SIGN_ONEWAY, + EL_SIGN_HEART, + EL_SIGN_TRIANGLE, + EL_SIGN_ROUND, + 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_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_SWITCHGATE_OPEN, + EL_SWITCHGATE_OPENING, + EL_SWITCHGATE_CLOSED, + EL_SWITCHGATE_CLOSING, + EL_TIMEGATE_OPEN, + EL_TIMEGATE_OPENING, + EL_TIMEGATE_CLOSED, + EL_TIMEGATE_CLOSING, + EL_TUBE_CROSS, + EL_TUBE_VERTICAL, + EL_TUBE_HORIZONTAL, + EL_TUBE_VERT_LEFT, + EL_TUBE_VERT_RIGHT, + EL_TUBE_HORIZ_UP, + EL_TUBE_HORIZ_DOWN, + EL_TUBE_LEFT_UP, + EL_TUBE_LEFT_DOWN, + EL_TUBE_RIGHT_UP, + EL_TUBE_RIGHT_DOWN }; - static int ep_solid_num = sizeof(ep_solid)/sizeof(int); + static int ep_solid_num = SIZEOF_ARRAY_INT(ep_solid); - static int ep_massiv[] = + static int ep_massive[] = { EL_BETON, EL_SALZSAEURE, @@ -684,6 +719,50 @@ void InitElementProperties() EL_BADEWANNE3, EL_BADEWANNE4, EL_BADEWANNE5, + EL_SP_HARD_GRAY, + EL_SP_HARD_GREEN, + EL_SP_HARD_BLUE, + EL_SP_HARD_RED, + EL_SP_HARD_YELLOW, + EL_SP_HARD_BASE1, + EL_SP_HARD_BASE2, + EL_SP_HARD_BASE3, + 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_SIGN_EXCLAMATION, + EL_SIGN_RADIOACTIVITY, + EL_SIGN_STOP, + EL_SIGN_WHEELCHAIR, + EL_SIGN_PARKING, + EL_SIGN_ONEWAY, + EL_SIGN_HEART, + EL_SIGN_TRIANGLE, + EL_SIGN_ROUND, + 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_CRYSTAL, EL_PFORTE1, EL_PFORTE2, EL_PFORTE3, @@ -691,14 +770,43 @@ void InitElementProperties() EL_PFORTE1X, EL_PFORTE2X, EL_PFORTE3X, - EL_PFORTE4X + 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_SWITCHGATE_OPEN, + EL_SWITCHGATE_OPENING, + EL_SWITCHGATE_CLOSED, + EL_SWITCHGATE_CLOSING, + EL_TIMEGATE_OPEN, + EL_TIMEGATE_OPENING, + EL_TIMEGATE_CLOSED, + EL_TIMEGATE_CLOSING, + EL_TUBE_CROSS, + EL_TUBE_VERTICAL, + EL_TUBE_HORIZONTAL, + EL_TUBE_VERT_LEFT, + EL_TUBE_VERT_RIGHT, + EL_TUBE_HORIZ_UP, + EL_TUBE_HORIZ_DOWN, + EL_TUBE_LEFT_UP, + EL_TUBE_LEFT_DOWN, + EL_TUBE_RIGHT_UP, + EL_TUBE_RIGHT_DOWN }; - static int ep_massiv_num = sizeof(ep_massiv)/sizeof(int); + static int ep_massive_num = SIZEOF_ARRAY_INT(ep_massive); static int ep_slippery[] = { EL_FELSBODEN, + EL_BD_WALL, EL_FELSBROCKEN, + EL_BD_ROCK, EL_EDELSTEIN, EL_EDELSTEIN_BD, EL_EDELSTEIN_GELB, @@ -715,9 +823,20 @@ void InitElementProperties() EL_BIRNE_AUS, EL_BADEWANNE1, EL_BADEWANNE2, - EL_SONDE + EL_SONDE, + EL_SP_ZONK, + EL_SP_INFOTRON, + EL_SP_CHIP_SINGLE, + EL_SP_CHIP_LEFT, + EL_SP_CHIP_RIGHT, + EL_SP_CHIP_UPPER, + EL_SP_CHIP_LOWER, + EL_SPEED_PILL, + EL_STEEL_SLANTED, + EL_PEARL, + EL_CRYSTAL }; - static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int); + static int ep_slippery_num = SIZEOF_ARRAY_INT(ep_slippery); static int ep_enemy[] = { @@ -728,9 +847,11 @@ void InitElementProperties() EL_MAMPFER, EL_MAMPFER2, EL_ROBOT, - EL_PACMAN + EL_PACMAN, + EL_SP_SNIKSNAK, + EL_SP_ELECTRON }; - static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int); + static int ep_enemy_num = SIZEOF_ARRAY_INT(ep_enemy); static int ep_mauer[] = { @@ -743,19 +864,65 @@ void InitElementProperties() 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_MAUERND + EL_MAUER_X, + EL_MAUER_Y, + EL_MAUER_XY, + EL_MAUERND, + EL_BD_WALL, + EL_SP_CHIP_SINGLE, + EL_SP_CHIP_LEFT, + EL_SP_CHIP_RIGHT, + EL_SP_CHIP_UPPER, + EL_SP_CHIP_LOWER, + EL_SP_HARD_GRAY, + EL_SP_HARD_GREEN, + EL_SP_HARD_BLUE, + EL_SP_HARD_RED, + EL_SP_HARD_YELLOW, + EL_SP_HARD_BASE1, + EL_SP_HARD_BASE2, + EL_SP_HARD_BASE3, + EL_SP_HARD_BASE4, + EL_SP_HARD_BASE5, + 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 }; - static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int); + static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer); static int ep_can_fall[] = { EL_FELSBROCKEN, + EL_BD_ROCK, EL_EDELSTEIN, EL_EDELSTEIN_BD, EL_EDELSTEIN_GELB, @@ -766,16 +933,24 @@ void InitElementProperties() EL_KOKOSNUSS, EL_TROPFEN, EL_MORAST_VOLL, - EL_SIEB_VOLL, - EL_SIEB2_VOLL, + EL_MAGIC_WALL_FULL, + EL_MAGIC_WALL_BD_FULL, EL_ZEIT_VOLL, - EL_ZEIT_LEER + EL_ZEIT_LEER, + EL_SP_ZONK, + EL_SP_INFOTRON, + EL_SP_DISK_ORANGE, + EL_PEARL, + EL_CRYSTAL, + EL_SPRING, + EL_DX_SUPABOMB }; - static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int); + static int ep_can_fall_num = SIZEOF_ARRAY_INT(ep_can_fall); static int ep_can_smash[] = { EL_FELSBROCKEN, + EL_BD_ROCK, EL_EDELSTEIN, EL_EDELSTEIN_BD, EL_EDELSTEIN_GELB, @@ -786,17 +961,29 @@ void InitElementProperties() 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_ZEIT_LEER, + EL_SP_ZONK, + EL_SP_INFOTRON, + EL_SP_DISK_ORANGE, + EL_PEARL, + EL_CRYSTAL, + EL_SPRING, + EL_DX_SUPABOMB }; - static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int); + static int ep_can_smash_num = SIZEOF_ARRAY_INT(ep_can_smash); static int ep_can_change[] = { EL_FELSBROCKEN, + EL_BD_ROCK, EL_EDELSTEIN, EL_EDELSTEIN_BD, EL_EDELSTEIN_GELB, @@ -804,7 +991,7 @@ void InitElementProperties() EL_EDELSTEIN_LILA, EL_DIAMANT }; - static int ep_can_change_num = sizeof(ep_can_change)/sizeof(int); + static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change); static int ep_can_move[] = { @@ -816,38 +1003,42 @@ void InitElementProperties() EL_MAMPFER2, EL_ROBOT, EL_PACMAN, - EL_MAULWURF, + EL_MOLE, EL_PINGUIN, EL_SCHWEIN, EL_DRACHE, - EL_SONDE + EL_SONDE, + EL_SP_SNIKSNAK, + EL_SP_ELECTRON, + EL_BALLOON, + EL_SPRING_MOVING }; - static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int); + static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move); static int ep_could_move[] = { - EL_KAEFER_R, - EL_KAEFER_O, - EL_KAEFER_L, - EL_KAEFER_U, - EL_FLIEGER_R, - EL_FLIEGER_O, - EL_FLIEGER_L, - EL_FLIEGER_U, - EL_BUTTERFLY_R, - EL_BUTTERFLY_O, - EL_BUTTERFLY_L, - EL_BUTTERFLY_U, - EL_FIREFLY_R, - EL_FIREFLY_O, - EL_FIREFLY_L, - EL_FIREFLY_U, - EL_PACMAN_R, - EL_PACMAN_O, - EL_PACMAN_L, - EL_PACMAN_U + 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_PACMAN_RIGHT, + EL_PACMAN_UP, + EL_PACMAN_LEFT, + EL_PACMAN_DOWN }; - static int ep_could_move_num = sizeof(ep_could_move)/sizeof(int); + static int ep_could_move_num = SIZEOF_ARRAY_INT(ep_could_move); static int ep_dont_touch[] = { @@ -856,7 +1047,7 @@ void InitElementProperties() EL_BUTTERFLY, EL_FIREFLY }; - static int ep_dont_touch_num = sizeof(ep_dont_touch)/sizeof(int); + static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch); static int ep_dont_go_to[] = { @@ -869,9 +1060,14 @@ void InitElementProperties() EL_ROBOT, EL_PACMAN, EL_TROPFEN, - EL_SALZSAEURE + EL_SALZSAEURE, + EL_SP_SNIKSNAK, + EL_SP_ELECTRON, + EL_SP_BUG_ACTIVE, + EL_TRAP_ACTIVE, + EL_LANDMINE }; - static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int); + static int ep_dont_go_to_num = SIZEOF_ARRAY_INT(ep_dont_go_to); static int ep_mampf2[] = { @@ -894,18 +1090,22 @@ void InitElementProperties() EL_EDELSTEIN_GELB, EL_EDELSTEIN_ROT, EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_DIAMANT, + EL_PEARL, + EL_CRYSTAL }; - static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int); + static int ep_mampf2_num = SIZEOF_ARRAY_INT(ep_mampf2); static int ep_bd_element[] = { EL_LEERRAUM, EL_ERDREICH, EL_FELSBODEN, + EL_BD_WALL, EL_FELSBROCKEN, + EL_BD_ROCK, EL_EDELSTEIN_BD, - EL_SIEB2_LEER, + EL_MAGIC_WALL_BD_OFF, EL_AUSGANG_ZU, EL_AUSGANG_AUF, EL_BETON, @@ -923,7 +1123,7 @@ void InitElementProperties() EL_AMOEBE_BD, EL_CHAR_FRAGE }; - static int ep_bd_element_num = sizeof(ep_bd_element)/sizeof(int); + static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element); static int ep_sb_element[] = { @@ -932,9 +1132,10 @@ void InitElementProperties() EL_SOKOBAN_OBJEKT, EL_SOKOBAN_FELD_LEER, EL_SOKOBAN_FELD_VOLL, - EL_SPIELFIGUR + EL_SPIELFIGUR, + EL_INVISIBLE_STEEL }; - static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int); + static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element); static int ep_gem[] = { @@ -945,13 +1146,14 @@ void InitElementProperties() EL_EDELSTEIN_LILA, EL_DIAMANT }; - static int ep_gem_num = sizeof(ep_gem)/sizeof(int); + static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem); static int ep_inactive[] = { EL_LEERRAUM, EL_ERDREICH, EL_MAUERWERK, + EL_BD_WALL, EL_FELSBODEN, EL_SCHLUESSEL, EL_BETON, @@ -963,6 +1165,10 @@ void InitElementProperties() 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, @@ -971,7 +1177,15 @@ void InitElementProperties() EL_PFORTE2X, EL_PFORTE3X, EL_PFORTE4X, - EL_DYNAMIT_AUS, + 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, @@ -992,30 +1206,111 @@ void InitElementProperties() EL_BADEWANNE3, EL_BADEWANNE4, EL_BADEWANNE5, - EL_SIEB_TOT, - EL_SIEB2_TOT, + EL_MAGIC_WALL_OFF, + EL_MAGIC_WALL_DEAD, + EL_MAGIC_WALL_BD_OFF, + EL_MAGIC_WALL_BD_DEAD, EL_AMOEBA2DIAM, - EL_BLOCKED + EL_BLOCKED, + EL_SP_EMPTY, + EL_SP_BASE, + EL_SP_PORT1_RIGHT, + EL_SP_PORT1_DOWN, + EL_SP_PORT1_LEFT, + EL_SP_PORT1_UP, + EL_SP_PORT2_RIGHT, + EL_SP_PORT2_DOWN, + EL_SP_PORT2_LEFT, + EL_SP_PORT2_UP, + EL_SP_PORT_X, + EL_SP_PORT_Y, + EL_SP_PORT_XY, + EL_SP_DISK_RED, + EL_SP_DISK_YELLOW, + EL_SP_CHIP_SINGLE, + EL_SP_CHIP_LEFT, + EL_SP_CHIP_RIGHT, + EL_SP_CHIP_UPPER, + EL_SP_CHIP_LOWER, + EL_SP_HARD_GRAY, + EL_SP_HARD_GREEN, + EL_SP_HARD_BLUE, + EL_SP_HARD_RED, + EL_SP_HARD_YELLOW, + EL_SP_HARD_BASE1, + EL_SP_HARD_BASE2, + EL_SP_HARD_BASE3, + 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_SIGN_EXCLAMATION, + EL_SIGN_RADIOACTIVITY, + EL_SIGN_STOP, + EL_SIGN_WHEELCHAIR, + EL_SIGN_PARKING, + EL_SIGN_ONEWAY, + EL_SIGN_HEART, + EL_SIGN_TRIANGLE, + EL_SIGN_ROUND, + 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 }; - static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int); + static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive); static int ep_explosive[] = { EL_BOMBE, - EL_DYNAMIT, - EL_DYNAMIT_AUS, - EL_DYNABOMB, + EL_DYNAMITE_ACTIVE, + EL_DYNAMITE_INACTIVE, + EL_DYNABOMB_ACTIVE_1, + EL_DYNABOMB_ACTIVE_2, + EL_DYNABOMB_ACTIVE_3, + EL_DYNABOMB_ACTIVE_4, EL_DYNABOMB_NR, EL_DYNABOMB_SZ, EL_DYNABOMB_XL, EL_KAEFER, - EL_MAULWURF, + EL_MOLE, EL_PINGUIN, EL_SCHWEIN, EL_DRACHE, - EL_SONDE + EL_SONDE, + EL_SP_DISK_RED, + EL_SP_DISK_ORANGE, + EL_SP_DISK_YELLOW, + EL_SP_SNIKSNAK, + EL_SP_ELECTRON, + EL_DX_SUPABOMB }; - static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int); + static int ep_explosive_num = SIZEOF_ARRAY_INT(ep_explosive); static int ep_mampf3[] = { @@ -1024,30 +1319,231 @@ void InitElementProperties() EL_EDELSTEIN_GELB, EL_EDELSTEIN_ROT, EL_EDELSTEIN_LILA, - EL_DIAMANT + EL_DIAMANT, + EL_PEARL, + EL_CRYSTAL }; - static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int); + static int ep_mampf3_num = SIZEOF_ARRAY_INT(ep_mampf3); static int ep_pushable[] = { EL_FELSBROCKEN, + EL_BD_ROCK, EL_BOMBE, EL_KOKOSNUSS, EL_ZEIT_LEER, EL_SOKOBAN_FELD_VOLL, EL_SOKOBAN_OBJEKT, - EL_SONDE + EL_SONDE, + EL_SP_ZONK, + EL_SP_DISK_ORANGE, + EL_SP_DISK_YELLOW, + EL_BALLOON, + EL_SPRING, + EL_DX_SUPABOMB + }; + static int ep_pushable_num = SIZEOF_ARRAY_INT(ep_pushable); + + static int ep_player[] = + { + EL_SPIELFIGUR, + EL_SPIELER1, + EL_SPIELER2, + EL_SPIELER3, + EL_SPIELER4 + }; + 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 + }; + static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content); + + static int ep_eatable[] = + { + EL_ERDREICH, + EL_SP_BASE, + EL_SP_BUG, + EL_TRAP_INACTIVE, + EL_SAND_INVISIBLE + }; + static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable); + + static int ep_sp_element[] = + { + EL_SP_EMPTY, + EL_SP_ZONK, + EL_SP_BASE, + EL_SP_MURPHY, + EL_SP_INFOTRON, + EL_SP_CHIP_SINGLE, + EL_SP_HARD_GRAY, + EL_SP_EXIT, + EL_SP_DISK_ORANGE, + EL_SP_PORT1_RIGHT, + EL_SP_PORT1_DOWN, + EL_SP_PORT1_LEFT, + EL_SP_PORT1_UP, + EL_SP_PORT2_RIGHT, + EL_SP_PORT2_DOWN, + EL_SP_PORT2_LEFT, + EL_SP_PORT2_UP, + EL_SP_SNIKSNAK, + EL_SP_DISK_YELLOW, + EL_SP_TERMINAL, + EL_SP_DISK_RED, + EL_SP_PORT_Y, + EL_SP_PORT_X, + EL_SP_PORT_XY, + EL_SP_ELECTRON, + EL_SP_BUG, + EL_SP_CHIP_LEFT, + EL_SP_CHIP_RIGHT, + EL_SP_HARD_BASE1, + EL_SP_HARD_GREEN, + EL_SP_HARD_BLUE, + EL_SP_HARD_RED, + EL_SP_HARD_YELLOW, + EL_SP_HARD_BASE2, + EL_SP_HARD_BASE3, + EL_SP_HARD_BASE4, + EL_SP_HARD_BASE5, + EL_SP_HARD_BASE6, + EL_SP_CHIP_UPPER, + EL_SP_CHIP_LOWER, + /* additional elements that appeared in newer Supaplex levels */ + EL_UNSICHTBAR, + /* more than one murphy in a level results in an inactive clone */ + EL_SP_MURPHY_CLONE + }; + static int ep_sp_element_num = SIZEOF_ARRAY_INT(ep_sp_element); + + 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_SP_PORT1_LEFT, + EL_SP_PORT2_LEFT, + EL_SP_PORT1_RIGHT, + EL_SP_PORT2_RIGHT, + EL_SP_PORT1_UP, + EL_SP_PORT2_UP, + EL_SP_PORT1_DOWN, + EL_SP_PORT2_DOWN, + EL_SP_PORT_X, + EL_SP_PORT_Y, + EL_SP_PORT_XY, + EL_SWITCHGATE_OPEN, + EL_TIMEGATE_OPEN + }; + static int ep_quick_gate_num = SIZEOF_ARRAY_INT(ep_quick_gate); + + static int ep_over_player[] = + { + EL_SP_PORT1_LEFT, + EL_SP_PORT2_LEFT, + EL_SP_PORT1_RIGHT, + EL_SP_PORT2_RIGHT, + EL_SP_PORT1_UP, + EL_SP_PORT2_UP, + EL_SP_PORT1_DOWN, + EL_SP_PORT2_DOWN, + EL_SP_PORT_X, + EL_SP_PORT_Y, + EL_SP_PORT_XY, + EL_TUBE_CROSS, + EL_TUBE_VERTICAL, + EL_TUBE_HORIZONTAL, + EL_TUBE_VERT_LEFT, + EL_TUBE_VERT_RIGHT, + EL_TUBE_HORIZ_UP, + EL_TUBE_HORIZ_DOWN, + EL_TUBE_LEFT_UP, + EL_TUBE_LEFT_DOWN, + EL_TUBE_RIGHT_UP, + EL_TUBE_RIGHT_DOWN + }; + static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player); + + static int ep_active_bomb[] = + { + EL_DYNAMITE_ACTIVE, + EL_DYNABOMB_ACTIVE_1, + EL_DYNABOMB_ACTIVE_2, + EL_DYNABOMB_ACTIVE_3, + EL_DYNABOMB_ACTIVE_4 + }; + 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, }; - static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int); + static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt); - static long ep_bit[] = + 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, + }; + static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch); + + static int ep_tube[] = + { + EL_TUBE_CROSS, + EL_TUBE_VERTICAL, + EL_TUBE_HORIZONTAL, + EL_TUBE_VERT_LEFT, + EL_TUBE_VERT_RIGHT, + EL_TUBE_HORIZ_UP, + EL_TUBE_HORIZ_DOWN, + EL_TUBE_LEFT_UP, + EL_TUBE_LEFT_DOWN, + EL_TUBE_RIGHT_UP, + EL_TUBE_RIGHT_DOWN + }; + static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube); + + static long ep1_bit[] = { EP_BIT_AMOEBALIVE, EP_BIT_AMOEBOID, EP_BIT_SCHLUESSEL, EP_BIT_PFORTE, EP_BIT_SOLID, - EP_BIT_MASSIV, + EP_BIT_MASSIVE, EP_BIT_SLIPPERY, EP_BIT_ENEMY, EP_BIT_MAUER, @@ -1065,16 +1561,29 @@ void InitElementProperties() EP_BIT_INACTIVE, EP_BIT_EXPLOSIVE, EP_BIT_MAMPF3, - EP_BIT_PUSHABLE + EP_BIT_PUSHABLE, + EP_BIT_PLAYER, + EP_BIT_HAS_CONTENT, + EP_BIT_EATABLE, + EP_BIT_SP_ELEMENT, + EP_BIT_QUICK_GATE, + EP_BIT_OVER_PLAYER, + EP_BIT_ACTIVE_BOMB + }; + static long ep2_bit[] = + { + EP_BIT_BELT, + EP_BIT_BELT_SWITCH, + EP_BIT_TUBE }; - static int *ep_array[] = + static int *ep1_array[] = { ep_amoebalive, ep_amoeboid, ep_schluessel, ep_pforte, ep_solid, - ep_massiv, + ep_massive, ep_slippery, ep_enemy, ep_mauer, @@ -1092,16 +1601,29 @@ void InitElementProperties() ep_inactive, ep_explosive, ep_mampf3, - ep_pushable + ep_pushable, + ep_player, + ep_has_content, + ep_eatable, + ep_sp_element, + ep_quick_gate, + ep_over_player, + ep_active_bomb }; - static int *ep_num[] = + static int *ep2_array[] = + { + ep_belt, + ep_belt_switch, + ep_tube + }; + static int *ep1_num[] = { &ep_amoebalive_num, &ep_amoeboid_num, &ep_schluessel_num, &ep_pforte_num, &ep_solid_num, - &ep_massiv_num, + &ep_massive_num, &ep_slippery_num, &ep_enemy_num, &ep_mauer_num, @@ -1119,55 +1641,73 @@ void InitElementProperties() &ep_inactive_num, &ep_explosive_num, &ep_mampf3_num, - &ep_pushable_num + &ep_pushable_num, + &ep_player_num, + &ep_has_content_num, + &ep_eatable_num, + &ep_sp_element_num, + &ep_quick_gate_num, + &ep_over_player_num, + &ep_active_bomb_num + }; + static int *ep2_num[] = + { + &ep_belt_num, + &ep_belt_switch_num, + &ep_tube_num }; - static int num_properties = sizeof(ep_num)/sizeof(int *); + static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *); + static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *); + + for(i=0; i