X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=9b553f1e419672c5990263cd805a235cb1ba70cf;hb=8afc6199767a6fcb7451efd2b3d5b070f6c99efb;hp=a8ce6a50bc357ce2dde3cede3b3535b47224973e;hpb=b96c3dc500494652748c24f0aa48a8201ea202dd;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index a8ce6a50..9b553f1e 100644 --- a/src/init.c +++ b/src/init.c @@ -1,99 +1,128 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2002 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* init.c * +* init.c * ***********************************************************/ -#include +#include "libgame/libgame.h" #include "init.h" #include "events.h" -#include "misc.h" -#include "sound.h" #include "screens.h" #include "editor.h" #include "game.h" #include "tape.h" #include "tools.h" #include "files.h" -#include "joystick.h" -#include "image.h" -#include "pcx.h" #include "network.h" #include "netserv.h" +#include "cartoons.h" +#include "config.h" -struct PictureFileInfo +static char *image_filename[NUM_PICTURES] = { - char *picture_filename; - boolean picture_with_mask; -}; - -#ifndef USE_SDL_LIBRARY -static int sound_process_id = 0; -#endif - + "RocksScreen.pcx", + "RocksElements.pcx", + "RocksDoor.pcx", + "RocksHeroes.pcx", + "RocksToons.pcx", + "RocksSP.pcx", + "RocksDC.pcx", + "RocksMore.pcx", + "RocksFontBig.pcx", + "RocksFontSmall.pcx", + "RocksFontMedium.pcx", + "RocksFontEM.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 InitImages(void); +static void InitMixer(void); static void InitSound(void); -static void InitSoundServer(void); static void InitGfx(void); static void InitGfxBackground(void); -static void LoadGfx(int, struct PictureFileInfo *); static void InitGadgets(void); static void InitElementProperties(void); +static void InitElementInfo(void); +static void InitGraphicInfo(void); +static void InitSoundInfo(); +static void Execute_Debug_Command(char *); -void OpenAll(int argc, char *argv[]) +void OpenAll(void) { -#if defined(MSDOS) || defined(WIN32) - initErrorFile(); -#endif + if (options.debug_command) + { + Execute_Debug_Command(options.debug_command); + + exit(0); + } if (options.serveronly) { -#ifdef WIN32 - Error(ERR_WARN, "networking not supported in Windows version"); -#else +#if defined(PLATFORM_UNIX) NetworkServer(options.server_port, options.serveronly); +#else + Error(ERR_WARN, "networking only supported in Unix version"); #endif - - /* never reached */ - exit(0); + 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(); - InitSoundServer(); + InitMixer(); InitJoysticks(); InitRND(NEW_RANDOMIZE); - signal(SIGINT, CloseAllAndExit); - signal(SIGTERM, CloseAllAndExit); + InitVideoDisplay(); + InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, + setup.fullscreen); - InitBufferedDisplay(&backbuffer, &window); InitEventFilter(FilterMouseMotionEvents); InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ + InitElementInfo(); InitLevelInfo(); + InitLevelArtworkInfo(); InitGadgets(); /* needs to know number of level series */ + InitImages(); /* needs to know current level directory */ + InitSound(); /* needs to know current level directory */ InitGfxBackground(); + InitToons(); + DrawMainMenu(); InitNetworkServer(); } +void InitSetup() +{ + LoadSetup(); /* global setup info */ +} + void InitPlayerInfo() { int i; @@ -102,14 +131,9 @@ void InitPlayerInfo() local_player = &stored_player[0]; for (i=0; iconnected = TRUE; - - LoadSetup(); /* global setup info */ } void InitLevelInfo() @@ -119,16 +143,26 @@ void InitLevelInfo() LoadLevelSetup_SeriesInfo(); /* last played level info */ } +void InitArtworkInfo() +{ + LoadArtworkInfo(); +} + +void InitLevelArtworkInfo() +{ + LoadLevelArtworkInfo(); +} + void InitNetworkServer() { -#if !defined(MSDOS) && !defined(WIN32) +#if defined(PLATFORM_UNIX) int nr_wanted; #endif if (!options.network) return; -#if !defined(MSDOS) && !defined(WIN32) +#if defined(PLATFORM_UNIX) nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED); if (!ConnectToServer(options.server_host, options.server_port)) @@ -142,287 +176,42 @@ void InitNetworkServer() #endif } -void InitSound() +static void InitImages() { - int i; - - if (sound_status == SOUND_OFF) - return; - -#ifdef USE_SDL_LIBRARY - /* initialize SDL audio */ - - if (SDL_Init(SDL_INIT_AUDIO) < 0) - { - Error(ERR_WARN, "SDL_Init() failed: %s", SDL_GetError()); - sound_status = SOUND_OFF; - return; - } + InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES); - if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0) - { - Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError()); - sound_status = SOUND_OFF; - return; - } - - Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4); - Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4); - - sound_status = SOUND_AVAILABLE; - sound_loops_allowed = TRUE; - -#else /* !USE_SDL_LIBRARY */ - -#if !defined(MSDOS) && !defined(WIN32) - if (access(sound_device_name, W_OK) != 0) - { - Error(ERR_WARN, "cannot access sound device - no sounds"); - sound_status = SOUND_OFF; - return; - } - - if ((sound_device = OpenAudio(sound_device_name)) < 0) - { - Error(ERR_WARN, "cannot open sound device - no sounds"); - sound_status = SOUND_OFF; - return; - } - - close(sound_device); - sound_status = SOUND_AVAILABLE; - -#ifdef VOXWARE - sound_loops_allowed = TRUE; - - /* - setup.sound_loops_on = TRUE; - */ - -#endif -#else /* MSDOS || WIN32 */ - sound_loops_allowed = TRUE; - - /* - setup.sound_loops_on = TRUE; - */ - -#endif /* MSDOS || WIN32 */ -#endif /* !USE_SDL_LIBRARY */ - - for(i=0; iidentifier); + InitReloadMusic(artwork.mus_current->identifier); - int i; - - if (global_joystick_status == JOYSTICK_OFF) - return; - - joystick_status = JOYSTICK_OFF; - -#ifdef USE_SDL_JOYSTICK - - if (!sdl_joystick_subsystem_initialized) - { - sdl_joystick_subsystem_initialized = TRUE; - - if (SDL_Init(SDL_INIT_JOYSTICK) < 0) - { - Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); - return; - } - } - - for (i=0; i= SDL_NumJoysticks()) - joystick_nr = -1; - - /* misuse joystick file descriptor variable to store joystick number */ - stored_player[i].joystick_fd = joystick_nr; - - /* this allows subsequent calls to 'InitJoysticks' for re-initialization */ - if (Check_SDL_JoystickOpened(joystick_nr)) - Close_SDL_Joystick(joystick_nr); - - if (!setup.input[i].use_joystick) - continue; - - if (!Open_SDL_Joystick(joystick_nr)) - { - Error(ERR_WARN, "cannot open joystick %d", joystick_nr); - continue; - } - - joystick_status = JOYSTICK_AVAILABLE; - } - -#else /* !USE_SDL_JOYSTICK */ - -#ifndef MSDOS - for (i=0; i= num_joysticks) - joystick_nr = -1; - - /* misuse joystick file descriptor variable to store joystick number */ - stored_player[i].joystick_fd = joystick_nr; - } -#endif - -#endif /* !USE_SDL_LIBRARY */ + InitSoundInfo(); } -void InitGfx() +static void InitTileClipmasks() { - int i, j; - -#ifdef USE_SDL_LIBRARY - SDL_Surface *sdl_image_tmp; -#else - GC copy_clipmask_gc; +#if defined(TARGET_X11) XGCValues clip_gc_values; unsigned long clip_gc_valuemask; -#endif -#ifdef MSDOS - static struct PictureFileInfo pic[NUM_PICTURES] = - { - { "Screen", TRUE }, - { "Door", TRUE }, - { "Heroes", TRUE }, - { "Toons", TRUE }, - { "SP", TRUE }, - { "DC", TRUE }, - { "More", TRUE }, - { "Font", FALSE }, - { "Font2", FALSE }, - { "Font3", FALSE } - }; -#else - static struct PictureFileInfo pic[NUM_PICTURES] = - { - { "RocksScreen", TRUE }, - { "RocksDoor", TRUE }, - { "RocksHeroes", TRUE }, - { "RocksToons", TRUE }, - { "RocksSP", TRUE }, - { "RocksDC", TRUE }, - { "RocksMore", TRUE }, - { "RocksFont", FALSE }, - { "RocksFont2", FALSE }, - { "RocksFont3", FALSE } - }; -#endif +#if defined(TARGET_X11_NATIVE) + GC copy_clipmask_gc; static struct { @@ -475,128 +264,161 @@ void InitGfx() { GFX2_SHIELD_ACTIVE, 3 }, { -1, 0 } }; +#endif /* TARGET_X11_NATIVE */ +#endif /* TARGET_X11 */ - /* create additional image buffers for double-buffering */ + int i; - pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); - pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); + /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */ + for(i=0; idrawable, + clip_gc_valuemask, &clip_gc_values); - /* create additional image buffers for masking of graphics */ + 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); + } + } -#ifdef USE_SDL_LIBRARY +#if defined(TARGET_X11_NATIVE) - /* initialize surface array to 'NULL' */ - for(i=0; iclip_mask, + clip_gc_valuemask, &clip_gc_values); - /* create only those masked surfaces we really need */ + /* create only those clipping Pixmaps we really need */ for(i=0; tile_needs_clipping[i].start>=0; i++) { + int j; + for(j=0; jformat, 0x00, 0x00, 0x00)); - if ((tile_masked[tile] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + getGraphicSource(graphic, &src_bitmap, &src_x, &src_y); + src_pixmap = src_bitmap->clip_mask; - SDL_FreeSurface(sdl_image_tmp); + tile_clipmask[tile] = XCreatePixmap(display, window->drawable, + TILEX, TILEY, 1); - BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0); + XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc, + src_x, src_y, TILEX, TILEY, 0, 0); } } -#else /* !USE_SDL_LIBRARY */ + XFreeGC(display, copy_clipmask_gc); - /* create graphic context structures needed for clipping */ - clip_gc_values.graphics_exposures = False; - clip_gc_valuemask = GCGraphicsExposures; - copy_clipmask_gc = - XCreateGC(display, clipmask[PIX_BACK], clip_gc_valuemask, &clip_gc_values); +#endif /* TARGET_X11_NATIVE */ +#endif /* TARGET_X11 */ +} - clip_gc_values.graphics_exposures = False; - clip_gc_valuemask = GCGraphicsExposures; - tile_clip_gc = - XCreateGC(display, window, clip_gc_valuemask, &clip_gc_values); +void FreeTileClipmasks() +{ +#if defined(TARGET_X11) + int i; - for(i=0; i=0; i++) + for(i=0; istored_clip_gc) { - int tile = tile_needs_clipping[i].start + j; - int graphic = tile; - int src_x, src_y; - int pixmap_nr; - Pixmap src_pixmap; + XFreeGC(display, pix[i]->stored_clip_gc); + pix[i]->stored_clip_gc = None; + } + } +#endif /* TARGET_X11 */ +} + +void InitGfx() +{ + int i; + + /* initialize some global variables */ + global.frames_per_second = 0; + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; + + /* initialize screen properties */ + InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE, + REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); + InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE); + InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE); + InitGfxScrollbufferInfo(FXSIZE, FYSIZE); - getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y); - src_pixmap = clipmask[pixmap_nr]; + /* 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); + + pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]); + + InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL); + + DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW); + DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED); + + DrawInitText("Loading graphics:", 120, FC_GREEN); - tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1); + for(i=0; ipicture_filename) - { - sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext); - DrawInitText(basefilename, 150, FC_YELLOW); - sprintf(filename, "%s/%s/%s", - options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename); - -#ifdef MSDOS - rest(100); -#endif /* MSDOS */ - -#ifdef USE_SDL_LIBRARY - /* load image to temporary surface */ - if ((sdl_image_tmp = IMG_Load(filename)) == NULL) - Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError()); - - /* create native non-transparent surface for current image */ - if ((pix[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - /* create native transparent surface for current image */ - SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY, - SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00)); - if ((pix_masked[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - /* free temporary surface */ - SDL_FreeSurface(sdl_image_tmp); - -#else /* !USE_SDL_LIBRARY */ - - pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename, - &pix[pos], &clipmask[pos]); - switch(pcx_err) + static char *leveldir_current_identifier = NULL; + static boolean last_override_level_graphics = FALSE; + static boolean last_override_level_sounds = FALSE; + static boolean last_override_level_music = FALSE; + + /* identifier for new artwork; default: artwork configured in setup */ + char *gfx_new_identifier = artwork.gfx_current->identifier; + char *snd_new_identifier = artwork.snd_current->identifier; + char *mus_new_identifier = artwork.mus_current->identifier; + +#if 0 + printf("graphics --> '%s' ('%s')\n", + artwork.gfx_current_identifier, artwork.gfx_current->filename); + printf("sounds --> '%s' ('%s')\n", + artwork.snd_current_identifier, artwork.snd_current->filename); + printf("music --> '%s' ('%s')\n", + artwork.mus_current_identifier, artwork.mus_current->filename); +#endif + + /* leveldir_current may be invalid (level group, parent link) */ + if (!validLevelSeries(leveldir_current)) + return; + +#if 0 + printf("--> '%s'\n", artwork.gfx_current_identifier); +#endif + + /* when a new level series was selected, check if there was a change + in custom artwork stored in level series directory */ + if (leveldir_current_identifier != leveldir_current->identifier) + { + char *identifier_old = leveldir_current_identifier; + char *identifier_new = leveldir_current->identifier; + + if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) != + getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) + gfx_new_identifier = identifier_new; + if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) != + getTreeInfoFromIdentifier(artwork.snd_first, identifier_new)) + snd_new_identifier = identifier_new; + if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) != + getTreeInfoFromIdentifier(artwork.mus_first, identifier_new)) + mus_new_identifier = identifier_new; + + leveldir_current_identifier = leveldir_current->identifier; + } + + /* custom level artwork configured in level series configuration file + always overrides custom level artwork stored in level series directory + and (level independant) custom artwork configured in setup menue */ + if (leveldir_current->graphics_set != NULL) + gfx_new_identifier = leveldir_current->graphics_set; + if (leveldir_current->sounds_set != NULL) + snd_new_identifier = leveldir_current->sounds_set; + if (leveldir_current->music_set != NULL) + mus_new_identifier = leveldir_current->music_set; + + if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 || + last_override_level_graphics != setup.override_level_graphics) + { + int i; + + setLevelArtworkDir(artwork.gfx_first); + + ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); + + for(i=0; ipicture_filename); + ReloadCustomImages(); + InitGraphicInfo(); + + FreeTileClipmasks(); + InitTileClipmasks(); + InitGfxBackground(); + + /* force redraw of (open or closed) door graphics */ + SetDoorState(DOOR_OPEN_ALL); + CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); - /* setting pix_masked[] to pix[] allows BlitBitmapMasked() to always - use pix_masked[], although they are the same when not using SDL */ - pix_masked[pos] = pix[pos]; + artwork.gfx_current_identifier = gfx_new_identifier; + last_override_level_graphics = setup.override_level_graphics; + } + + if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 || + last_override_level_sounds != setup.override_level_sounds) + { + /* set artwork path to send it to the sound server process */ + setLevelArtworkDir(artwork.snd_first); + + InitReloadSounds(snd_new_identifier); + + artwork.snd_current_identifier = snd_new_identifier; + last_override_level_sounds = setup.override_level_sounds; + } -#endif /* !USE_SDL_LIBRARY */ + if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 || + last_override_level_music != setup.override_level_music) + { + /* set artwork path to send it to the sound server process */ + setLevelArtworkDir(artwork.mus_first); + + InitReloadMusic(mus_new_identifier); + + artwork.mus_current_identifier = mus_new_identifier; + last_override_level_music = setup.override_level_music; } -#ifndef USE_SDL_LIBRARY - /* zugehörige Maske laden (wenn vorhanden) */ - if (pic->picture_with_mask && !clipmask[pos]) - Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename); -#endif /* !USE_SDL_LIBRARY */ +#if 0 + printf("<-- '%s'\n", artwork.gfx_current_identifier); +#endif } void InitGadgets() @@ -695,9 +554,373 @@ void InitGadgets() CreateScreenGadgets(); } +void InitElementInfo() +{ + int i; + + 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 } + }; + + /* always start with reliable default values */ + for(i=0; i -1) + { + int element = element_to_graphic[i].element; + int graphic = element_to_graphic[i].graphic; + + element_info[element].graphic = graphic; + i++; + } +} + +static void InitGraphicInfo() +{ + int i; + + image_files = getCurrentImageList(); + + for(i=0; i %d\n", image_files[GFX_BD_DIAMOND].parameter[GFXARG_NUM_FRAMES]); + printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFXARG_NUM_FRAMES]); + + graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK].src_x = 0; + graphic_info[GFX_ABLENK].src_y = 0; + + graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); + graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX; + graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX; + graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX; + graphic_info[GFX_ABLENK + 1].src_y = 0; + graphic_info[GFX_ABLENK + 2].src_y = 0; + graphic_info[GFX_ABLENK + 3].src_y = 0; +#endif +} + +static void InitSoundInfo() +{ + sound_files = getCurrentSoundList(); + + /* initialize sound effect lookup table for element actions */ + InitGameSound(); +} + void InitElementProperties() { - int i,j; + int i, j; static int ep_amoebalive[] = { @@ -706,7 +929,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[] = { @@ -716,7 +939,7 @@ 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[] = { @@ -729,7 +952,7 @@ void InitElementProperties() 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[] = { @@ -750,9 +973,13 @@ void InitElementProperties() 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, @@ -765,7 +992,7 @@ void InitElementProperties() 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[] = { @@ -787,13 +1014,19 @@ void InitElementProperties() EL_AMOEBE_BD, EL_MORAST_VOLL, EL_MORAST_LEER, + 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, @@ -819,6 +1052,7 @@ void InitElementProperties() 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, @@ -867,6 +1101,30 @@ void InitElementProperties() EL_CRYSTAL, EL_WALL_PEARL, EL_WALL_CRYSTAL, + EL_PFORTE1, + EL_PFORTE2, + EL_PFORTE3, + EL_PFORTE4, + EL_PFORTE1X, + EL_PFORTE2X, + EL_PFORTE3X, + EL_PFORTE4X, + EL_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, @@ -879,7 +1137,7 @@ void InitElementProperties() 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_massive[] = { @@ -890,26 +1148,6 @@ void InitElementProperties() EL_BADEWANNE3, EL_BADEWANNE4, EL_BADEWANNE5, - 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_CLOSED, - EL_TIMEGATE_OPEN, - EL_TIMEGATE_CLOSED, EL_SP_HARD_GRAY, EL_SP_HARD_GREEN, EL_SP_HARD_BLUE, @@ -954,6 +1192,30 @@ void InitElementProperties() EL_EMC_STEEL_WALL_3, EL_EMC_STEEL_WALL_4, EL_CRYSTAL, + EL_PFORTE1, + EL_PFORTE2, + EL_PFORTE3, + EL_PFORTE4, + EL_PFORTE1X, + EL_PFORTE2X, + EL_PFORTE3X, + EL_PFORTE4X, + EL_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, @@ -966,7 +1228,7 @@ void InitElementProperties() EL_TUBE_RIGHT_UP, EL_TUBE_RIGHT_DOWN }; - static int ep_massive_num = sizeof(ep_massive)/sizeof(int); + static int ep_massive_num = SIZEOF_ARRAY_INT(ep_massive); static int ep_slippery[] = { @@ -1003,7 +1265,7 @@ void InitElementProperties() 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[] = { @@ -1018,7 +1280,7 @@ void InitElementProperties() 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[] = { @@ -1067,6 +1329,7 @@ void InitElementProperties() EL_SP_HARD_BASE5, EL_SP_HARD_BASE6, EL_SP_TERMINAL, + EL_SP_TERMINAL_ACTIVE, EL_SP_EXIT, EL_INVISIBLE_STEEL, EL_STEEL_SLANTED, @@ -1083,7 +1346,7 @@ void InitElementProperties() 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[] = { @@ -1111,7 +1374,7 @@ void InitElementProperties() 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[] = { @@ -1144,7 +1407,7 @@ void InitElementProperties() 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[] = { @@ -1157,7 +1420,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[] = { @@ -1179,7 +1442,7 @@ void InitElementProperties() 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[] = { @@ -1204,7 +1467,7 @@ void InitElementProperties() 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[] = { @@ -1213,7 +1476,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[] = { @@ -1233,7 +1496,7 @@ void InitElementProperties() 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[] = { @@ -1260,7 +1523,7 @@ void InitElementProperties() 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[] = { @@ -1289,7 +1552,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[] = { @@ -1301,7 +1564,7 @@ void InitElementProperties() 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[] = { @@ -1310,10 +1573,9 @@ void InitElementProperties() EL_EDELSTEIN_GELB, EL_EDELSTEIN_ROT, EL_EDELSTEIN_LILA, - EL_DIAMANT, - EL_SP_INFOTRON + 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[] = { @@ -1450,7 +1712,7 @@ void InitElementProperties() 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[] = { @@ -1477,7 +1739,7 @@ void InitElementProperties() 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[] = { @@ -1490,7 +1752,7 @@ void InitElementProperties() 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[] = { @@ -1509,7 +1771,7 @@ void InitElementProperties() EL_SPRING, EL_DX_SUPABOMB }; - static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int); + static int ep_pushable_num = SIZEOF_ARRAY_INT(ep_pushable); static int ep_player[] = { @@ -1519,7 +1781,7 @@ void InitElementProperties() EL_SPIELER3, EL_SPIELER4 }; - static int ep_player_num = sizeof(ep_player)/sizeof(int); + static int ep_player_num = SIZEOF_ARRAY_INT(ep_player); static int ep_has_content[] = { @@ -1529,7 +1791,7 @@ void InitElementProperties() EL_AMOEBE_VOLL, EL_AMOEBE_BD }; - static int ep_has_content_num = sizeof(ep_has_content)/sizeof(int); + static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content); static int ep_eatable[] = { @@ -1539,7 +1801,7 @@ void InitElementProperties() EL_TRAP_INACTIVE, EL_SAND_INVISIBLE }; - static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int); + static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable); static int ep_sp_element[] = { @@ -1588,7 +1850,7 @@ void InitElementProperties() /* more than one murphy in a level results in an inactive clone */ EL_SP_MURPHY_CLONE }; - static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int); + static int ep_sp_element_num = SIZEOF_ARRAY_INT(ep_sp_element); static int ep_quick_gate[] = { @@ -1614,7 +1876,7 @@ void InitElementProperties() EL_SWITCHGATE_OPEN, EL_TIMEGATE_OPEN }; - static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int); + static int ep_quick_gate_num = SIZEOF_ARRAY_INT(ep_quick_gate); static int ep_over_player[] = { @@ -1641,7 +1903,7 @@ void InitElementProperties() EL_TUBE_RIGHT_UP, EL_TUBE_RIGHT_DOWN }; - static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int); + static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player); static int ep_active_bomb[] = { @@ -1651,7 +1913,7 @@ void InitElementProperties() EL_DYNABOMB_ACTIVE_3, EL_DYNABOMB_ACTIVE_4 }; - static int ep_active_bomb_num = sizeof(ep_active_bomb)/sizeof(int); + static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb); static int ep_belt[] = { @@ -1668,7 +1930,7 @@ void InitElementProperties() EL_BELT4_MIDDLE, EL_BELT4_RIGHT, }; - static int ep_belt_num = sizeof(ep_belt)/sizeof(int); + static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt); static int ep_belt_switch[] = { @@ -1685,7 +1947,7 @@ void InitElementProperties() EL_BELT4_SWITCH_MIDDLE, EL_BELT4_SWITCH_RIGHT, }; - static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int); + static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch); static int ep_tube[] = { @@ -1701,7 +1963,7 @@ void InitElementProperties() EL_TUBE_RIGHT_UP, EL_TUBE_RIGHT_DOWN }; - static int ep_tube_num = sizeof(ep_tube)/sizeof(int); + static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube); static long ep1_bit[] = { @@ -1823,8 +2085,8 @@ void InitElementProperties() &ep_belt_switch_num, &ep_tube_num }; - static int num_properties1 = sizeof(ep1_num)/sizeof(int *); - static int num_properties2 = sizeof(ep2_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