void OpenAll(int argc, char *argv[])
{
+#ifdef MSDOS
+ initErrorFile();
+#endif
+
if (options.serveronly)
{
NetworkServer(options.server_port, options.serveronly);
exit(0);
}
- InitLevelAndPlayerInfo();
-
InitCounter();
InitSound();
InitSoundServer();
InitDisplay();
InitWindow(argc, argv);
+#ifndef USE_SDL_LIBRARY
XMapWindow(display, window);
XFlush(display);
+#endif
InitGfx();
- InitElementProperties();
- InitGadgets();
+ InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
+
+ InitLevelAndPlayerInfo();
+ return;
+ InitGadgets(); /* needs to know number of level series */
DrawMainMenu();
local_player->connected = TRUE;
- LoadLevelInfo(); /* global level info */
- LoadSetup(); /* global setup info */
- LoadLevelSetup(); /* info about last played level */
+ LoadLevelInfo(); /* global level info */
+ LoadSetup(); /* global setup info */
+ LoadLevelSetup_LastSeries(); /* last played series info */
+ LoadLevelSetup_SeriesInfo(); /* last played level info */
}
void InitNetworkServer()
void InitDisplay()
{
+#ifdef USE_SDL_LIBRARY
+ /* initialize SDL */
+ if (SDL_Init(SDL_INIT_VIDEO) < 0)
+ Error(ERR_EXIT, "SDL_Init() failed: %s\n", SDL_GetError());
+
+ /* automatically cleanup SDL stuff after exit() */
+ atexit(SDL_Quit);
+
+#else /* !USE_SDL_LIBRARY */
+
#ifndef MSDOS
XVisualInfo vinfo_template, *vinfo;
int num_visuals;
printf("Sorry, cannot get appropriate visual.\n");
exit(-1);
}
-#endif
+#endif /* !MSDOS */
+#endif /* !USE_SDL_LIBRARY */
}
void InitWindow(int argc, char *argv[])
{
+#ifdef USE_SDL_LIBRARY
+ /* open SDL video output device (window or fullscreen mode) */
+ if ((sdl_window = SDL_SetVideoMode(WIN_XSIZE, WIN_YSIZE, WIN_SDL_DEPTH,
+ SDL_HWSURFACE))
+ == NULL)
+ Error(ERR_EXIT, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+
+ /* set window and icon title */
+ SDL_WM_SetCaption(WINDOW_TITLE_STRING, WINDOW_TITLE_STRING);
+
+ /* select event types: initially no mouse motion events */
+ SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
+
+#else /* !USE_SDL_LIBRARY */
+
unsigned int border_width = 4;
XGCValues gc_values;
unsigned long gc_valuemask;
gc_values.background = pen_bg;
gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
gc = XCreateGC(display, window, gc_valuemask, &gc_values);
-}
-
-void DrawInitText(char *text, int ypos, int color)
-{
- if (display && window && pix[PIX_SMALLFONT])
- {
- XFillRectangle(display,window,gc,0,ypos, WIN_XSIZE,FONT2_YSIZE);
- DrawTextExt(window,gc,(WIN_XSIZE-strlen(text)*FONT2_XSIZE)/2,
- ypos,text,FS_SMALL,color);
- XFlush(display);
- }
+#endif /* !USE_SDL_LIBRARY */
}
void InitGfx()
{
int i,j;
+
+#ifdef USE_SDL_LIBRARY
+ SDL_Surface *sdl_image_tmp;
+#else
GC copy_clipmask_gc;
XGCValues clip_gc_values;
unsigned long clip_gc_valuemask;
+#endif
#ifdef MSDOS
static struct PictureFileInfo pic[NUM_PICTURES] =
{ "Toons", TRUE },
{ "SP", TRUE },
{ "DC", TRUE },
+ { "More", TRUE },
{ "Font", FALSE },
- { "Font2", FALSE }
+ { "Font2", FALSE },
+ { "Font3", FALSE }
};
#else
static struct PictureFileInfo pic[NUM_PICTURES] =
{ "RocksToons", TRUE },
{ "RocksSP", TRUE },
{ "RocksDC", TRUE },
+ { "RocksMore", TRUE },
{ "RocksFont", FALSE },
- { "RocksFont2", FALSE }
+ { "RocksFont2", FALSE },
+ { "RocksFont3", FALSE }
};
#endif
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
+ { GFX2_SHIELD_PASSIVE, 3 },
+ { GFX2_SHIELD_ACTIVE, 3 },
{ -1, 0 }
};
#endif
#endif
-
-
LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
DrawInitText(WINDOW_TITLE_STRING,20,FC_YELLOW);
DrawInitText(COPYRIGHT_STRING,50,FC_RED);
debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:");
#endif
+#ifdef USE_SDL_LIBRARY
+ /* create some native image surfaces for double-buffer purposes */
+
+ /* create double-buffer surface for background image */
+ if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ WIN_XSIZE, WIN_YSIZE,
+ WIN_SDL_DEPTH, 0, 0, 0, 0))
+ == NULL)
+ Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s\n", SDL_GetError());
+
+ if ((sdl_pix[PIX_DB_BACK] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s\n", SDL_GetError());
+
+ SDL_FreeSurface(sdl_image_tmp);
+
+ /* create double-buffer surface for door image */
+ if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ 3 * DXSIZE, DYSIZE + VYSIZE,
+ WIN_SDL_DEPTH, 0, 0, 0, 0))
+ == NULL)
+ Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s\n", SDL_GetError());
+
+ if ((sdl_pix[PIX_DB_DOOR] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s\n", SDL_GetError());
+
+ SDL_FreeSurface(sdl_image_tmp);
+
+ /* create double-buffer surface for field image */
+ if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ FXSIZE, FYSIZE,
+ WIN_SDL_DEPTH, 0, 0, 0, 0))
+ == NULL)
+ Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s\n", SDL_GetError());
+
+ if ((sdl_pix[PIX_DB_FIELD] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s\n", SDL_GetError());
+
+ SDL_FreeSurface(sdl_image_tmp);
+
+ /* initialize surface array to 'NULL' */
+ for(i=0; i<NUM_TILES; i++)
+ sdl_tile_masked[i] = NULL;
+
+ /* create only those masked surfaces we really need */
+ for(i=0; tile_needs_clipping[i].start>=0; i++)
+ {
+ for(j=0; j<tile_needs_clipping[i].count; j++)
+ {
+ int tile = tile_needs_clipping[i].start + j;
+#if 0
+ int graphic = tile;
+ int src_x, src_y;
+ int pixmap_nr;
+ Pixmap src_pixmap;
+
+ getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
+ src_pixmap = clipmask[pixmap_nr];
+
+ tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+
+ XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
+ src_x,src_y, TILEX,TILEY, 0,0);
+#endif
+ }
+ }
+
+ sdl_drawto = sdl_backbuffer = sdl_pix[PIX_DB_BACK];
+ sdl_fieldbuffer = sdl_pix[PIX_DB_FIELD];
+ SetDrawtoField(DRAW_BACKBUFFER);
+
+ SDLCopyArea(sdl_pix[PIX_BACK], sdl_backbuffer,
+ 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+ SDLFillRectangle(sdl_pix[PIX_DB_BACK],
+ REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, 0x000000);
+ SDLFillRectangle(sdl_pix[PIX_DB_DOOR],
+ 0,0, 3*DXSIZE,DYSIZE+VYSIZE, 0x000000);
+
+#else /* !USE_SDL_LIBRARY */
+
pix[PIX_DB_BACK] = XCreatePixmap(display, window,
WIN_XSIZE,WIN_YSIZE,
XDefaultDepth(display,screen));
fieldbuffer = pix[PIX_DB_FIELD];
SetDrawtoField(DRAW_BACKBUFFER);
- XCopyArea(display,pix[PIX_BACK],backbuffer,gc,
+ XCopyArea(display, pix[PIX_BACK], backbuffer, gc,
0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
- XFillRectangle(display,pix[PIX_DB_BACK],gc,
+ XFillRectangle(display, pix[PIX_DB_BACK], gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
- XFillRectangle(display,pix[PIX_DB_DOOR],gc,
+ XFillRectangle(display, pix[PIX_DB_DOOR], gc,
0,0, 3*DXSIZE,DYSIZE+VYSIZE);
+#endif /* !USE_SDL_LIBRARY */
for(i=0; i<MAX_BUF_XSIZE; i++)
for(j=0; j<MAX_BUF_YSIZE; j++)
char *picture_ext = ".xpm";
char *picturemask_ext = "Mask.xbm";
#else
+
+#ifdef USE_SDL_LIBRARY
+ SDL_Surface *sdl_image_tmp;
+#else /* !USE_SDL_LIBRARY */
int pcx_err;
+#endif /* !USE_SDL_LIBRARY */
char *picture_ext = ".pcx";
-#endif
+
+#endif /* !USE_XPM_LIBRARY */
/* Grafik laden */
if (pic->picture_filename)
debug_print_timestamp(1, NULL); /* initialize timestamp function */
#endif
+#ifdef USE_SDL_LIBRARY
+ /* load image to temporary surface */
+ if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
+ Error(ERR_EXIT, "IMG_Load() failed: %s\n", SDL_GetError());
+
+ /* create native non-transparent surface for current image */
+ if ((sdl_pix[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s\n", 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 ((sdl_pix_masked[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s\n", SDL_GetError());
+
+ /* free temporary surface */
+ SDL_FreeSurface(sdl_image_tmp);
+
+#else /* !USE_SDL_LIBRARY */
+
#ifdef USE_XPM_LIBRARY
xpm_att[pos].valuemask = XpmCloseness;
if (!pix[pos])
Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
+#endif /* !USE_SDL_LIBRARY */
}
+#ifndef USE_SDL_LIBRARY
/* zugehörige Maske laden (wenn vorhanden) */
if (pic->picture_with_mask)
{
if (!clipmask[pos])
Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
}
+#endif /* !USE_SDL_LIBRARY */
}
void InitGadgets()
CreateGameButtons();
CreateTapeButtons();
CreateToolButtons();
+ CreateScreenGadgets();
}
void InitElementProperties()
EL_EM_GATE_3X,
EL_EM_GATE_4X,
EL_SWITCHGATE_OPEN,
- EL_SWITCHGATE_CLOSED
+ EL_SWITCHGATE_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_CLOSED,
+ 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);
EL_MAUER_X,
EL_MAUER_Y,
EL_MAUER_XY,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
EL_AMOEBE_BD,
EL_MORAST_VOLL,
EL_MORAST_LEER,
- EL_SIEB_INAKTIV,
- EL_SIEB_LEER,
- EL_SIEB_VOLL,
- EL_SIEB_TOT,
- EL_SIEB2_INAKTIV,
- EL_SIEB2_LEER,
- EL_SIEB2_VOLL,
- EL_SIEB2_TOT,
+ EL_MAGIC_WALL_OFF,
+ EL_MAGIC_WALL_EMPTY,
+ EL_MAGIC_WALL_FULL,
+ EL_MAGIC_WALL_DEAD,
+ EL_MAGIC_WALL_BD_OFF,
+ EL_MAGIC_WALL_BD_EMPTY,
+ EL_MAGIC_WALL_BD_FULL,
+ EL_MAGIC_WALL_BD_DEAD,
EL_LIFE,
EL_LIFE_ASYNC,
EL_BADEWANNE1,
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_EXIT,
EL_SIGN_YINYANG,
EL_SIGN_OTHER,
- EL_STEEL_SLANTED
+ 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_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);
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,
EL_SIGN_EXIT,
EL_SIGN_YINYANG,
EL_SIGN_OTHER,
- EL_STEEL_SLANTED
+ 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_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_massive_num = sizeof(ep_massive)/sizeof(int);
static int ep_slippery[] =
{
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
EL_SPEED_PILL,
- EL_STEEL_SLANTED
+ EL_STEEL_SLANTED,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
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_TERMINAL,
EL_SP_EXIT,
EL_INVISIBLE_STEEL,
- EL_STEEL_SLANTED
+ 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_can_fall[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
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_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ 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_smash[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ 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_change[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_DRACHE,
EL_SONDE,
EL_SP_SNIKSNAK,
- EL_SP_ELECTRON
+ EL_SP_ELECTRON,
+ EL_BALLOON,
+ EL_SPRING_MOVING
};
static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
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);
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);
EL_LEERRAUM,
EL_ERDREICH,
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN_BD,
- EL_SIEB2_INAKTIV,
+ EL_MAGIC_WALL_BD_OFF,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_BETON,
EL_LEERRAUM,
EL_ERDREICH,
EL_MAUERWERK,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_SCHLUESSEL,
EL_BETON,
EL_BADEWANNE3,
EL_BADEWANNE4,
EL_BADEWANNE5,
- EL_SIEB_INAKTIV,
- EL_SIEB_TOT,
- EL_SIEB2_INAKTIV,
- 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_SP_EMPTY,
EL_SIGN_EXIT,
EL_SIGN_YINYANG,
EL_SIGN_OTHER,
- EL_STEEL_SLANTED
+ 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);
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
EL_SP_SNIKSNAK,
- EL_SP_ELECTRON
+ EL_SP_ELECTRON,
+ EL_DX_SUPABOMB
};
static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
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_pushable[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_BOMBE,
EL_KOKOSNUSS,
EL_ZEIT_LEER,
EL_SONDE,
EL_SP_ZONK,
EL_SP_DISK_ORANGE,
- EL_SP_DISK_YELLOW
+ EL_SP_DISK_YELLOW,
+ EL_BALLOON,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
EL_ERDREICH,
EL_SP_BASE,
EL_SP_BUG,
+ EL_TRAP_INACTIVE,
EL_SAND_INVISIBLE
};
static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
/* additional elements that appeared in newer Supaplex levels */
- EL_UNSICHTBAR
+ 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(ep_sp_element)/sizeof(int);
EL_SP_PORT_X,
EL_SP_PORT_Y,
EL_SP_PORT_XY,
- EL_SWITCHGATE_OPEN
+ EL_SWITCHGATE_OPEN,
+ EL_TIMEGATE_OPEN
};
static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int);
EL_SP_PORT2_DOWN,
EL_SP_PORT_X,
EL_SP_PORT_Y,
- EL_SP_PORT_XY
+ 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(ep_over_player)/sizeof(int);
};
static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int);
+ 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(ep_tube)/sizeof(int);
+
static long ep1_bit[] =
{
EP_BIT_AMOEBALIVE,
static long ep2_bit[] =
{
EP_BIT_BELT,
- EP_BIT_BELT_SWITCH
+ EP_BIT_BELT_SWITCH,
+ EP_BIT_TUBE
};
static int *ep1_array[] =
{
static int *ep2_array[] =
{
ep_belt,
- ep_belt_switch
+ ep_belt_switch,
+ ep_tube
};
static int *ep1_num[] =
{
static int *ep2_num[] =
{
&ep_belt_num,
- &ep_belt_switch_num
+ &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 *);
projects / rocksndiamonds.git / blobdiff