#include <signal.h>
+#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 "gfxload.h"
-#include "gifload.h"
#include "network.h"
#include "netserv.h"
-#ifdef DEBUG
-
-#define DEBUG_TIMING
-
-#endif
-
struct PictureFileInfo
{
char *picture_filename;
boolean picture_with_mask;
};
-struct IconFileInfo
-{
- char *picture_filename;
- char *picturemask_filename;
-};
-
-static int sound_process_id = 0;
-
-static void InitLevelAndPlayerInfo(void);
+static void InitPlayerInfo(void);
+static void InitLevelInfo(void);
static void InitNetworkServer(void);
-static void InitDisplay(void);
static void InitSound(void);
static void InitSoundServer(void);
-static void InitWindow(int, char **);
+static void InitDisplay(void);
static void InitGfx(void);
+static void InitGfxBackground(void);
static void LoadGfx(int, struct PictureFileInfo *);
+static void InitGadgets(void);
static void InitElementProperties(void);
-void OpenAll(int argc, char *argv[])
+void OpenAll(void)
{
+#if !defined(PLATFORM_UNIX)
+ initErrorFile();
+#endif
+
if (options.serveronly)
{
+#if defined(PLATFORM_UNIX)
NetworkServer(options.server_port, options.serveronly);
+#else
+ Error(ERR_WARN, "networking not supported in Windows version");
+#endif
/* never reached */
exit(0);
}
- InitLevelAndPlayerInfo();
+ InitProgramInfo(UNIX_USERDATA_DIRECTORY,
+ PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING,
+ ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+ MSDOS_POINTER_FILENAME);
+
+ InitPlayerInfo();
InitCounter();
InitSound();
signal(SIGTERM, CloseAllAndExit);
InitDisplay();
- InitWindow(argc, argv);
-
- XMapWindow(display, window);
- XFlush(display);
+ InitEventFilter(FilterMouseMotionEvents);
InitGfx();
- InitElementProperties();
+ InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
+ InitLevelInfo();
+ InitGadgets(); /* needs to know number of level series */
+
+ InitGfxBackground();
DrawMainMenu();
InitNetworkServer();
}
-void InitLevelAndPlayerInfo()
+void InitPlayerInfo()
{
int i;
local_player->connected = TRUE;
- if (!LoadLevelInfo()) /* global level info */
- Error(ERR_EXIT, NULL);
+ LoadSetup(); /* global setup info */
+}
- LoadSetup(); /* global setup info */
- LoadLevelSetup(); /* info about last played level */
+void InitLevelInfo()
+{
+ LoadLevelInfo(); /* global level info */
+ LoadLevelSetup_LastSeries(); /* last played series info */
+ LoadLevelSetup_SeriesInfo(); /* last played level info */
}
void InitNetworkServer()
{
+#if defined(PLATFORM_UNIX)
int nr_wanted;
+#endif
if (!options.network)
return;
+#if defined(PLATFORM_UNIX)
nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
if (!ConnectToServer(options.server_host, options.server_port))
- Error(ERR_EXIT, "cannot connect to multiplayer server");
+ Error(ERR_EXIT, "cannot connect to network game server");
- SendToServer_Nickname(setup.alias_name);
+ SendToServer_PlayerName(setup.player_name);
SendToServer_ProtocolVersion();
if (nr_wanted)
SendToServer_NrWanted(nr_wanted);
+#endif
}
void InitSound()
{
int i;
- if (sound_status == SOUND_OFF)
- return;
-
-#ifndef MSDOS
- 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 = open(sound_device_name,O_WRONLY))<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
- sound_loops_allowed = TRUE;
+ OpenAudio(&audio);
- /*
- setup.sound_loops_on = TRUE;
- */
-
-#endif
+ AllocSoundArray(NUM_SOUNDS);
for(i=0; i<NUM_SOUNDS; i++)
{
-#ifdef MSDOS
- sprintf(sound_name[i], "%d", i+1);
-#endif
- Sound[i].name = sound_name[i];
- if (!LoadSound(&Sound[i]))
+ if (!LoadSound(i, sound_name[i]))
{
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
+ audio.loops_available = FALSE;
+ audio.sound_enabled = FALSE;
+
return;
}
}
void InitSoundServer()
{
- if (sound_status == SOUND_OFF)
+ if (!audio.sound_available)
return;
-#ifndef MSDOS
- if (pipe(sound_pipe)<0)
+#if !defined(TARGET_SDL)
+#if defined(PLATFORM_UNIX)
+
+ if (pipe(audio.soundserver_pipe) < 0)
{
Error(ERR_WARN, "cannot create pipe - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
- if ((sound_process_id = fork()) < 0)
+ if ((audio.soundserver_pid = fork()) < 0)
{
Error(ERR_WARN, "cannot create sound server process - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
- if (!sound_process_id) /* we are child */
+ if (audio.soundserver_pid == 0) /* we are child */
{
SoundServer();
/* never reached */
exit(0);
}
- else /* we are parent */
- close(sound_pipe[0]); /* no reading from pipe needed */
-#else
+ else /* we are parent */
+ close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+
+#else /* !PLATFORM_UNIX */
+
SoundServer();
-#endif
+
+#endif /* !PLATFORM_UNIX */
+#endif /* !TARGET_SDL */
}
void InitJoysticks()
{
+#if defined(TARGET_SDL)
+ static boolean sdl_joystick_subsystem_initialized = FALSE;
+#endif
+
int i;
if (global_joystick_status == JOYSTICK_OFF)
joystick_status = JOYSTICK_OFF;
-#ifndef MSDOS
+#if defined(TARGET_SDL)
+
+ 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<MAX_PLAYERS; i++)
+ {
+ char *device_name = setup.input[i].joy.device_name;
+ int joystick_nr = getJoystickNrFromDeviceName(device_name);
+
+ if (joystick_nr >= 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 /* !TARGET_SDL */
+
+#if defined(PLATFORM_UNIX)
for (i=0; i<MAX_PLAYERS; i++)
{
char *device_name = setup.input[i].joy.device_name;
joystick_status = JOYSTICK_AVAILABLE;
}
-#else
- joystick_status = JOYSTICK_AVAILABLE;
-#endif
-}
-void InitDisplay()
-{
- XVisualInfo vinfo_template, *vinfo;
- int num_visuals;
- unsigned int depth;
-
- /* connect to X server */
- if (!(display = XOpenDisplay(options.display_name)))
- Error(ERR_EXIT, "cannot connect to X server %s",
- XDisplayName(options.display_name));
-
- screen = DefaultScreen(display);
- visual = DefaultVisual(display, screen);
- depth = DefaultDepth(display, screen);
- cmap = DefaultColormap(display, screen);
-
- /* look for good enough visual */
- vinfo_template.screen = screen;
- vinfo_template.class = (depth == 8 ? PseudoColor : TrueColor);
- vinfo_template.depth = depth;
- if ((vinfo = XGetVisualInfo(display, VisualScreenMask | VisualClassMask |
- VisualDepthMask, &vinfo_template, &num_visuals)))
- {
- visual = vinfo->visual;
- XFree((void *)vinfo);
- }
+#else /* !PLATFORM_UNIX */
- /* got appropriate visual? */
- if (depth < 8)
- {
- printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
- exit(-1);
- }
- else if ((depth ==8 && visual->class != PseudoColor) ||
- (depth > 8 && visual->class != TrueColor &&
- visual->class != DirectColor))
- {
- printf("Sorry, cannot get appropriate visual.\n");
- exit(-1);
- }
-}
+ /* try to access two joysticks; if that fails, try to access just one */
+ if (install_joystick(JOY_TYPE_2PADS) == 0 ||
+ install_joystick(JOY_TYPE_AUTODETECT) == 0)
+ joystick_status = JOYSTICK_AVAILABLE;
-void InitWindow(int argc, char *argv[])
-{
- unsigned int border_width = 4;
- Pixmap icon_pixmap, iconmask_pixmap;
- unsigned int icon_width,icon_height;
- int icon_hot_x,icon_hot_y;
- char icon_filename[256];
- XSizeHints size_hints;
- XWMHints wm_hints;
- XClassHint class_hints;
- XTextProperty windowName, iconName;
- XGCValues gc_values;
- unsigned long gc_valuemask;
- char *window_name = WINDOWTITLE_STRING;
- char *icon_name = WINDOWTITLE_STRING;
- long window_event_mask;
- Atom proto_atom = None, delete_atom = None;
- int screen_width, screen_height;
- int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS;
- unsigned long pen_fg = WhitePixel(display,screen);
- unsigned long pen_bg = BlackPixel(display,screen);
-
-#ifndef MSDOS
- static struct IconFileInfo icon_pic =
- {
- "rocks_icon.xbm",
- "rocks_iconmask.xbm"
- };
-#endif
+ /*
+ load_joystick_data(JOYSTICK_FILENAME);
+ */
- screen_width = XDisplayWidth(display, screen);
- screen_height = XDisplayHeight(display, screen);
-
- width = WIN_XSIZE;
- height = WIN_YSIZE;
-
- win_xpos = (screen_width - width) / 2;
- win_ypos = (screen_height - height) / 2;
-
- window = XCreateSimpleWindow(display, RootWindow(display, screen),
- win_xpos, win_ypos, width, height, border_width,
- pen_fg, pen_bg);
-
-#ifndef MSDOS
- proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE);
- delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE);
- if ((proto_atom != None) && (delete_atom != None))
- XChangeProperty(display, window, proto_atom, XA_ATOM, 32,
- PropModePrepend, (unsigned char *) &delete_atom, 1);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picture_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &icon_pixmap,&icon_hot_x,&icon_hot_y);
- if (!icon_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picturemask_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &iconmask_pixmap,&icon_hot_x,&icon_hot_y);
- if (!iconmask_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- size_hints.width = size_hints.min_width = size_hints.max_width = width;
- size_hints.height = size_hints.min_height = size_hints.max_height = height;
- size_hints.flags = PSize | PMinSize | PMaxSize;
-
- if (win_xpos || win_ypos)
+ for (i=0; i<MAX_PLAYERS; i++)
{
- size_hints.x = win_xpos;
- size_hints.y = win_ypos;
- size_hints.flags |= PPosition;
- }
-
- if (!XStringListToTextProperty(&window_name, 1, &windowName))
- Error(ERR_EXIT, "structure allocation for windowName failed");
-
- if (!XStringListToTextProperty(&icon_name, 1, &iconName))
- Error(ERR_EXIT, "structure allocation for iconName failed");
-
- 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 = program_name;
- class_hints.res_class = "Rocks'n'Diamonds";
-
- XSetWMProperties(display, window, &windowName, &iconName,
- argv, argc, &size_hints, &wm_hints,
- &class_hints);
+ char *device_name = setup.input[i].joy.device_name;
+ int joystick_nr = getJoystickNrFromDeviceName(device_name);
- XFree(windowName.value);
- XFree(iconName.value);
+ if (joystick_nr >= num_joysticks)
+ joystick_nr = -1;
- /* Select event types wanted */
- window_event_mask = ExposureMask | StructureNotifyMask | FocusChangeMask |
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
- KeyPressMask | KeyReleaseMask;
- XSelectInput(display, window, window_event_mask);
+ /* misuse joystick file descriptor variable to store joystick number */
+ stored_player[i].joystick_fd = joystick_nr;
+ }
#endif
- /* 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);
+#endif /* !TARGET_SDL */
}
-void DrawInitText(char *text, int ypos, int color)
+void InitDisplay()
{
- 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);
- }
+ InitVideoDisplay();
+ InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+ setup.fullscreen);
}
void InitGfx()
{
- int i,j;
+ int i;
+
+#if defined(TARGET_X11)
GC copy_clipmask_gc;
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 },
- { "Font", FALSE },
- { "Font2", FALSE }
- };
-#else
+#if !defined(PLATFORM_MSDOS)
static struct PictureFileInfo pic[NUM_PICTURES] =
{
{ "RocksScreen", TRUE },
{ "RocksDoor", TRUE },
{ "RocksHeroes", TRUE },
{ "RocksToons", TRUE },
+ { "RocksSP", TRUE },
+ { "RocksDC", TRUE },
+ { "RocksMore", TRUE },
{ "RocksFont", FALSE },
- { "RocksFont2", FALSE }
+ { "RocksFont2", FALSE },
+ { "RocksFont3", FALSE }
+ };
+#else
+ 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 }
};
#endif
+#ifdef TARGET_X11
static struct
{
int start;
{ GFX_SPIELER4_RIGHT, 4 },
{ GFX_SPIELER4_PUSH_LEFT, 4 },
{ GFX_SPIELER4_PUSH_RIGHT, 4 },
+ { GFX_SP_MURPHY, 1 },
+ { GFX_MURPHY_GO_LEFT, 3 },
+ { GFX_MURPHY_GO_RIGHT, 3 },
+ { GFX_MURPHY_SNAP_UP, 1 },
+ { GFX_MURPHY_SNAP_DOWN, 1 },
+ { GFX_MURPHY_SNAP_RIGHT, 1 },
+ { GFX_MURPHY_SNAP_LEFT, 1 },
+ { GFX_MURPHY_PUSH_RIGHT, 1 },
+ { GFX_MURPHY_PUSH_LEFT, 1 },
{ GFX_GEBLUBBER, 4 },
{ GFX_DYNAMIT, 7 },
{ GFX_DYNABOMB, 4 },
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
+ { GFX2_SHIELD_PASSIVE, 3 },
+ { GFX2_SHIELD_ACTIVE, 3 },
{ -1, 0 }
};
-
-#ifdef DEBUG_TIMING
- long count1, count2;
- count1 = Counter();
#endif
- LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
- DrawInitText(WINDOWTITLE_STRING,20,FC_YELLOW);
- DrawInitText(COPYRIGHT_STRING,50,FC_RED);
-#ifdef MSDOS
- DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
+ /* 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);
+
+ /* 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);
+
+ LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]);
+ InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+
+ DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
+ DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
+#if defined(PLATFORM_MSDOS)
+ DrawInitText(PROGRAM_DOS_PORT_STRING, 210, FC_BLUE);
rest(200);
-#endif MSDOS
+#endif
DrawInitText("Loading graphics:",120,FC_GREEN);
for(i=0; i<NUM_PICTURES; i++)
if (i != PIX_SMALLFONT)
LoadGfx(i,&pic[i]);
-#ifdef DEBUG_TIMING
- count2 = Counter();
- printf("SUMMARY: %.2f SECONDS LOADING TIME\n",(float)(count2-count1)/1000.0);
-#endif
+ InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+ /* create additional image buffers for masking of graphics */
- pix[PIX_DB_BACK] = XCreatePixmap(display, window,
- WIN_XSIZE,WIN_YSIZE,
- XDefaultDepth(display,screen));
- pix[PIX_DB_DOOR] = XCreatePixmap(display, window,
- 3*DXSIZE,DYSIZE+VYSIZE,
- XDefaultDepth(display,screen));
- pix[PIX_DB_FIELD] = XCreatePixmap(display, window,
- FXSIZE,FYSIZE,
- XDefaultDepth(display,screen));
+#if defined(TARGET_SDL)
+
+#if 0
+ /* initialize surface array to 'NULL' */
+ for(i=0; i<NUM_TILES; i++)
+ 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++)
+ {
+ SDL_Surface *sdl_image_tmp;
+ int tile = tile_needs_clipping[i].start + j;
+ int graphic = tile;
+ int src_x, src_y;
+ int bitmap_nr;
+ Bitmap src_bitmap;
+
+ getGraphicSource(graphic, &bitmap_nr, &src_x, &src_y);
+ src_bitmap = pix[bitmap_nr];
+
+ /* create surface for masked tile graphic */
+ if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, TILEX, TILEY,
+ WIN_SDL_DEPTH, 0, 0, 0, 0))
+ == NULL)
+ Error(ERR_EXIT, "SDL_CreateRGBSurface() 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 ((tile_masked[tile] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+
+ SDL_FreeSurface(sdl_image_tmp);
+
+ BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0);
+ }
+ }
+#endif
+
+#else /* !TARGET_SDL */
+
+ /* 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);
+ XCreateGC(display, pix[PIX_BACK]->clip_mask,
+ clip_gc_valuemask, &clip_gc_values);
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
tile_clip_gc =
- XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+ XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+
+ for(i=0; i<NUM_BITMAPS; i++)
+ {
+ if (pix[i]->clip_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);
+ }
+ }
/* initialize pixmap array to Pixmap 'None' */
for(i=0; i<NUM_TILES; i++)
/* create only those clipping Pixmaps we really need */
for(i=0; tile_needs_clipping[i].start>=0; i++)
{
+ int j;
+
for(j=0; j<tile_needs_clipping[i].count; j++)
{
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
+ int pixmap_nr;
Pixmap src_pixmap;
- if (graphic >= GFX_START_ROCKSSCREEN &&
- graphic <= GFX_END_ROCKSSCREEN)
- {
- src_pixmap = clipmask[PIX_BACK];
- graphic -= GFX_START_ROCKSSCREEN;
- src_x = SX + (graphic % GFX_PER_LINE) * TILEX;
- src_y = SY + (graphic / GFX_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSHEROES &&
- graphic <= GFX_END_ROCKSHEROES)
- {
- src_pixmap = clipmask[PIX_HEROES];
- graphic -= GFX_START_ROCKSHEROES;
- src_x = (graphic % HEROES_PER_LINE) * TILEX;
- src_y = (graphic / HEROES_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSFONT &&
- graphic <= GFX_END_ROCKSFONT)
- {
- src_pixmap = clipmask[PIX_BIGFONT];
- graphic -= GFX_START_ROCKSFONT;
- src_x = (graphic % FONT_CHARS_PER_LINE) * TILEX;
- src_y = (graphic / FONT_CHARS_PER_LINE) * TILEY +
- FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY;
- }
- else
- break;
+ getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
+ src_pixmap = pix[pixmap_nr]->clip_mask;
- tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+ 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);
+ XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc,
+ src_x, src_y, TILEX, TILEY, 0, 0);
}
}
- if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
- Error(ERR_EXIT, "cannot create additional pixmaps");
+#endif /* !TARGET_SDL */
+}
- for(i=0; i<NUM_PIXMAPS; i++)
- {
- if (clipmask[i])
- {
- clip_gc_values.graphics_exposures = False;
- clip_gc_values.clip_mask = clipmask[i];
- clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
- clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
- }
- }
+void InitGfxBackground()
+{
+ int x, y;
- drawto = backbuffer = pix[PIX_DB_BACK];
+ drawto = backbuffer;
fieldbuffer = pix[PIX_DB_FIELD];
SetDrawtoField(DRAW_BACKBUFFER);
- XCopyArea(display,pix[PIX_BACK],backbuffer,gc,
- 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
- XFillRectangle(display,pix[PIX_DB_BACK],gc,
- REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
- XFillRectangle(display,pix[PIX_DB_DOOR],gc,
- 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
+ BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+ ClearRectangle(backbuffer, REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+ ClearRectangle(pix[PIX_DB_DOOR], 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
- for(i=0; i<MAX_BUF_XSIZE; i++)
- for(j=0; j<MAX_BUF_YSIZE; j++)
- redraw[i][j] = 0;
+ for(x=0; x<MAX_BUF_XSIZE; x++)
+ for(y=0; y<MAX_BUF_YSIZE; y++)
+ redraw[x][y] = 0;
redraw_tiles = 0;
redraw_mask = REDRAW_ALL;
}
char basefilename[256];
char filename[256];
-#ifdef XPM_INCLUDE_FILE
- int xpm_err, xbm_err;
- unsigned int width,height;
- int hot_x,hot_y;
- Pixmap shapemask;
- char *picture_ext = ".xpm";
- char *picturemask_ext = "Mask.xbm";
+#if defined(TARGET_SDL)
+ SDL_Surface *sdl_image_tmp;
#else
- int gif_err;
- char *picture_ext = ".pcx";
-#endif
-
-#ifdef DEBUG_TIMING
- long count1, count2;
+ int pcx_err;
#endif
+ char *picture_ext = ".pcx";
/* Grafik laden */
if (pic->picture_filename)
sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext);
DrawInitText(basefilename, 150, FC_YELLOW);
sprintf(filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+ options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
rest(100);
-#endif MSDOS
-
-#ifdef DEBUG_TIMING
- count1 = Counter();
#endif
-#ifdef XPM_INCLUDE_FILE
+ pix[pos] = CreateBitmapStruct();
- xpm_att[pos].valuemask = XpmCloseness;
- xpm_att[pos].closeness = 20000;
- xpm_err = XpmReadFileToPixmap(display,window,filename,
- &pix[pos],&shapemask,&xpm_att[pos]);
+#if defined(TARGET_SDL)
+ /* load image to temporary surface */
+ if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
+ Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
- switch(xpm_err)
- {
- case XpmOpenFailed:
- Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
- case XpmFileInvalid:
- Error(ERR_EXIT, "invalid XPM file '%s'", filename);
- case XpmNoMemory:
- Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
- case XpmColorFailed:
- Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
- default:
- break;
- }
+ /* create native non-transparent surface for current image */
+ if ((pix[pos]->surface = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-#ifdef DEBUG_TIMING
- count2 = Counter();
- printf("XPM LOADING %s IN %.2f SECONDS\n",
- filename,(float)(count2-count1)/1000.0);
-#endif
+ /* 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[pos]->surface_masked = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-#else
+ /* free temporary surface */
+ SDL_FreeSurface(sdl_image_tmp);
- gif_err = Read_GIF_to_Pixmaps(display, window, filename,
- &pix[pos], &clipmask[pos]);
+#else /* !TARGET_SDL */
- switch(gif_err)
+ pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc,
+ filename,
+ &pix[pos]->drawable, &pix[pos]->clip_mask);
+ switch(pcx_err)
{
- case GIF_Success:
+ case PCX_Success:
break;
- case GIF_OpenFailed:
- Error(ERR_EXIT, "cannot open GIF file '%s'", filename);
- case GIF_ReadFailed:
- Error(ERR_EXIT, "cannot read GIF file '%s'", filename);
- case GIF_FileInvalid:
- Error(ERR_EXIT, "invalid GIF file '%s'", filename);
- case GIF_NoMemory:
- Error(ERR_EXIT, "not enough memory for GIF file '%s'", filename);
- case GIF_ColorFailed:
- Error(ERR_EXIT, "cannot get colors for GIF file '%s'", filename);
+ case PCX_OpenFailed:
+ Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
+ case PCX_ReadFailed:
+ Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
+ case PCX_FileInvalid:
+ Error(ERR_EXIT, "invalid PCX file '%s'", filename);
+ case PCX_NoMemory:
+ Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
+ case PCX_ColorFailed:
+ Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
default:
break;
}
-#ifdef DEBUG_TIMING
- count2 = Counter();
- printf("GIF LOADING %s IN %.2f SECONDS\n",
- filename,(float)(count2-count1)/1000.0);
-#endif
-
-#endif
-
- if (!pix[pos])
+ if (!pix[pos]->drawable)
Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
- }
-
- /* zugehörige Maske laden (wenn vorhanden) */
- if (pic->picture_with_mask)
- {
-
-#ifdef XPM_INCLUDE_FILE
- sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
- DrawInitText(basefilename, 150, FC_YELLOW);
- sprintf(filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+ pix[pos]->gc = window->gc;
-#ifdef DEBUG_TIMING
- count1 = Counter();
+#if 0
+ /* 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];
#endif
- xbm_err = XReadBitmapFile(display,window,filename,
- &width,&height,&clipmask[pos],&hot_x,&hot_y);
-
- switch(xbm_err)
- {
- case BitmapSuccess:
- break;
- case BitmapOpenFailed:
- Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
- case BitmapFileInvalid:
- Error(ERR_EXIT, "invalid XBM file '%s'", filename);
- case BitmapNoMemory:
- Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
- break;
- default:
- break;
- }
-
-#ifdef DEBUG_TIMING
- count2 = Counter();
- printf("XBM LOADING %s IN %.2f SECONDS\n",
- filename,(float)(count2-count1)/1000.0);
-#endif
+#endif /* !TARGET_SDL */
+ }
+#if defined(TARGET_X11)
+ /* check if clip mask was correctly created */
+ if (pic->picture_with_mask && !pix[pos]->clip_mask)
+ Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
#endif
+}
- if (!clipmask[pos])
- Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
- }
+void InitGadgets()
+{
+ CreateLevelEditorGadgets();
+ CreateGameButtons();
+ CreateTapeButtons();
+ CreateToolButtons();
+ CreateScreenGadgets();
}
void InitElementProperties()
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);
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_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_VOLL,
- EL_SIEB_LEER,
- EL_SIEB_TOT,
- EL_SIEB2_VOLL,
- EL_SIEB2_LEER,
- 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_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_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_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_massiv[] =
+ static int ep_massive[] =
{
EL_BETON,
EL_SALZSAEURE,
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_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_CLOSED,
+ 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_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(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_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);
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);
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_MAUER_X,
EL_MAUER_Y,
EL_MAUER_XY,
- EL_MAUERND
+ 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_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_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_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_smash[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
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_change[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
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_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);
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);
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_LEER,
+ EL_MAGIC_WALL_BD_OFF,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_BETON,
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);
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT
+ EL_DIAMANT,
+ EL_SP_INFOTRON
};
static int ep_gem_num = sizeof(ep_gem)/sizeof(int);
EL_LEERRAUM,
EL_ERDREICH,
EL_MAUERWERK,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_SCHLUESSEL,
EL_BETON,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
EL_SCHLUESSEL4,
+ EL_EM_KEY_1,
+ EL_EM_KEY_2,
+ EL_EM_KEY_3,
+ EL_EM_KEY_4,
EL_PFORTE1,
EL_PFORTE2,
EL_PFORTE3,
EL_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,
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_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);
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_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(ep_pushable)/sizeof(int);
};
static int ep_player_num = sizeof(ep_player)/sizeof(int);
- static long ep_bit[] =
+ 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(ep_has_content)/sizeof(int);
+
+ static int ep_eatable[] =
+ {
+ EL_ERDREICH,
+ EL_SP_BASE,
+ EL_SP_BUG,
+ EL_TRAP_INACTIVE,
+ EL_SAND_INVISIBLE
+ };
+ static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
+
+ 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(ep_sp_element)/sizeof(int);
+
+ 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(ep_quick_gate)/sizeof(int);
+
+ 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(ep_over_player)/sizeof(int);
+
+ 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(ep_active_bomb)/sizeof(int);
+
+ 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_belt_num = sizeof(ep_belt)/sizeof(int);
+
+ 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(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,
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,
EP_BIT_EXPLOSIVE,
EP_BIT_MAMPF3,
EP_BIT_PUSHABLE,
- EP_BIT_PLAYER
+ 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,
ep_explosive,
ep_mampf3,
ep_pushable,
- ep_player
+ ep_player,
+ ep_has_content,
+ ep_eatable,
+ ep_sp_element,
+ ep_quick_gate,
+ ep_over_player,
+ ep_active_bomb
+ };
+ static int *ep2_array[] =
+ {
+ ep_belt,
+ ep_belt_switch,
+ ep_tube
};
- static int *ep_num[] =
+ 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,
&ep_explosive_num,
&ep_mampf3_num,
&ep_pushable_num,
- &ep_player_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(ep1_num)/sizeof(int *);
+ static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
for(i=0; i<MAX_ELEMENTS; i++)
- Elementeigenschaften[i] = 0;
+ {
+ Elementeigenschaften1[i] = 0;
+ Elementeigenschaften2[i] = 0;
+ }
- for(i=0; i<num_properties; i++)
- for(j=0; j<*(ep_num[i]); j++)
- Elementeigenschaften[(ep_array[i])[j]] |= ep_bit[i];
- for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
- Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+ for(i=0; i<num_properties1; i++)
+ for(j=0; j<*(ep1_num[i]); j++)
+ Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
+ for(i=0; i<num_properties2; i++)
+ for(j=0; j<*(ep2_num[i]); j++)
+ Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
+
+ for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+ Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
void CloseAllAndExit(int exit_value)
{
int i;
- if (sound_process_id)
+#if defined(TARGET_SDL)
+ StopSounds();
+ FreeSounds(NUM_SOUNDS);
+#else
+ if (audio.soundserver_pid)
{
StopSounds();
- kill(sound_process_id, SIGTERM);
+ kill(audio.soundserver_pid, SIGTERM);
FreeSounds(NUM_SOUNDS);
}
-
- for(i=0; i<NUM_PIXMAPS; i++)
- {
- if (pix[i])
- {
-#ifdef XPM_INCLUDE_FILE
- if (i<NUM_PICTURES) /* XPM pictures */
- {
- XFreeColors(display,DefaultColormap(display,screen),
- xpm_att[i].pixels,xpm_att[i].npixels,0);
- XpmFreeAttributes(&xpm_att[i]);
- }
#endif
- XFreePixmap(display,pix[i]);
- }
- if (clipmask[i])
- XFreePixmap(display,clipmask[i]);
- if (clip_gc[i])
- XFreeGC(display, clip_gc[i]);
- }
+ for(i=0; i<NUM_BITMAPS; i++)
+ FreeBitmap(pix[i]);
+
+#if defined(TARGET_SDL)
+ KeyboardAutoRepeatOn();
+#else
+
+#if 0
if (gc)
XFreeGC(display, gc);
+#endif
if (display)
{
- XAutoRepeatOn(display);
+ KeyboardAutoRepeatOn();
XCloseDisplay(display);
}
+#endif
+
+#if !defined(PLATFORM_UNIX)
+ dumpErrorFile();
+#endif
exit(exit_value);
}
projects / rocksndiamonds.git / blobdiff