/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* ©1995 Artsoft Development *
-* Holger Schemel *
-* 33659 Bielefeld-Senne *
-* Telefon: (0521) 493245 *
-* eMail: aeglos@valinor.owl.de *
-* aeglos@uni-paderborn.de *
-* q99492@pbhrzx.uni-paderborn.de *
+* (c) 1995-98 Artsoft Entertainment *
+* Holger Schemel *
+* Oststrasse 11a *
+* 33604 Bielefeld *
+* phone: ++49 +521 290471 *
+* email: aeglos@valinor.owl.de *
*----------------------------------------------------------*
* init.c *
***********************************************************/
+#include <signal.h>
+
#include "init.h"
#include "misc.h"
#include "sound.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
-#include "gfxload.h"
-#include "gifload.h"
-
-#include <signal.h>
-
-#ifdef DEBUG
-/*
-#define DEBUG_TIMING
-*/
-#endif
+#include "image.h"
+#include "pcx.h"
+#include "network.h"
+#include "netserv.h"
struct PictureFileInfo
{
char *picture_filename;
- BOOL picture_with_mask;
+ boolean picture_with_mask;
};
struct IconFileInfo
static int sound_process_id = 0;
static void InitLevelAndPlayerInfo(void);
-static void InitDisplay(int, char **);
+static void InitNetworkServer(void);
+static void InitDisplay(void);
static void InitSound(void);
-static void InitSoundProcess(void);
+static void InitSoundServer(void);
static void InitWindow(int, char **);
static void InitGfx(void);
static void LoadGfx(int, struct PictureFileInfo *);
void OpenAll(int argc, char *argv[])
{
+ if (options.serveronly)
+ {
+ NetworkServer(options.server_port, options.serveronly);
+
+ /* never reached */
+ exit(0);
+ }
+
InitLevelAndPlayerInfo();
InitCounter();
InitSound();
- InitSoundProcess();
- InitJoystick();
+ InitSoundServer();
+ InitJoysticks();
InitRND(NEW_RANDOMIZE);
- signal(SIGINT, CloseAll);
- signal(SIGTERM, CloseAll);
+ signal(SIGINT, CloseAllAndExit);
+ signal(SIGTERM, CloseAllAndExit);
- InitDisplay(argc, argv);
+ InitDisplay();
InitWindow(argc, argv);
XMapWindow(display, window);
InitElementProperties();
DrawMainMenu();
+
+ InitNetworkServer();
}
void InitLevelAndPlayerInfo()
{
- if (!LoadLevelInfo()) /* global level info */
- CloseAll();
+ int i;
- LoadPlayerInfo(PLAYER_SETUP); /* global setup info */
- LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */
+ /* choose default local player */
+ local_player = &stored_player[0];
+
+ for (i=0; i<MAX_PLAYERS; i++)
+ {
+ stored_player[i].joystick_fd = -1; /* joystick device closed */
+ stored_player[i].connected = FALSE;
+ }
+
+ local_player->connected = TRUE;
+
+ LoadLevelInfo(); /* global level info */
+ LoadSetup(); /* global setup info */
+ LoadLevelSetup(); /* info about last played level */
+}
+
+void InitNetworkServer()
+{
+#ifndef MSDOS
+ int nr_wanted;
+#endif
+
+ if (!options.network)
+ return;
+
+#ifndef MSDOS
+ nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+
+ if (!ConnectToServer(options.server_host, options.server_port))
+ Error(ERR_EXIT, "cannot connect to network game server");
+
+ SendToServer_PlayerName(setup.player_name);
+ SendToServer_ProtocolVersion();
+
+ if (nr_wanted)
+ SendToServer_NrWanted(nr_wanted);
+#endif
}
void InitSound()
{
int i;
- if (sound_status==SOUND_OFF)
+ if (sound_status == SOUND_OFF)
return;
#ifndef MSDOS
- if (access(sound_device_name,W_OK)<0)
+ if (access(sound_device_name, W_OK) != 0)
{
- fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname);
- sound_status=SOUND_OFF;
+ Error(ERR_WARN, "cannot access sound device - no sounds");
+ sound_status = SOUND_OFF;
return;
}
- if ((sound_device=open(sound_device_name,O_WRONLY))<0)
+ if ((sound_device = open(sound_device_name,O_WRONLY))<0)
{
- fprintf(stderr,"%s: cannot open sound device - no sounds\n",progname);
- sound_status=SOUND_OFF;
+ Error(ERR_WARN, "cannot open sound device - no sounds");
+ sound_status = SOUND_OFF;
return;
}
close(sound_device);
- sound_status=SOUND_AVAILABLE;
+ sound_status = SOUND_AVAILABLE;
#ifdef VOXWARE
sound_loops_allowed = TRUE;
- sound_loops_on = TRUE;
+
+ /*
+ setup.sound_loops_on = TRUE;
+ */
+
#endif
-#else
+#else /* MSDOS */
sound_loops_allowed = TRUE;
- sound_loops_on = TRUE;
-#endif
- for(i=0;i<NUM_SOUNDS;i++)
+ /*
+ setup.sound_loops_on = TRUE;
+ */
+
+#endif /* MSDOS */
+
+ for(i=0; i<NUM_SOUNDS; i++)
{
#ifdef MSDOS
- sprintf(sound_name[i], "%d", i+1);
+ sprintf(sound_name[i], "%d", i + 1);
#endif
+
Sound[i].name = sound_name[i];
if (!LoadSound(&Sound[i]))
{
- sound_status=SOUND_OFF;
+ sound_status = SOUND_OFF;
return;
}
}
}
-void InitSoundProcess()
+void InitSoundServer()
{
- if (sound_status==SOUND_OFF)
+ if (sound_status == SOUND_OFF)
return;
#ifndef MSDOS
+
if (pipe(sound_pipe)<0)
{
- fprintf(stderr,"%s: cannot create pipe - no sounds\n",progname);
- sound_status=SOUND_OFF;
+ Error(ERR_WARN, "cannot create pipe - no sounds");
+ sound_status = SOUND_OFF;
return;
}
- if ((sound_process_id=fork())<0)
+ if ((sound_process_id = fork()) < 0)
{
- fprintf(stderr,"%s: cannot create child process - no sounds\n",progname);
- sound_status=SOUND_OFF;
+ Error(ERR_WARN, "cannot create sound server process - no sounds");
+ sound_status = SOUND_OFF;
return;
}
if (!sound_process_id) /* we are child */
+ {
SoundServer();
+
+ /* never reached */
+ exit(0);
+ }
else /* we are parent */
close(sound_pipe[0]); /* no reading from pipe needed */
-#else
+
+#else /* MSDOS */
+
SoundServer();
-#endif
+
+#endif /* MSDOS */
}
-void InitJoystick()
+void InitJoysticks()
{
- if (global_joystick_status==JOYSTICK_OFF)
+ int i;
+
+ if (global_joystick_status == JOYSTICK_OFF)
return;
+ joystick_status = JOYSTICK_OFF;
+
#ifndef MSDOS
- if (access(joystick_device_name[joystick_nr],R_OK)<0)
+ for (i=0; i<MAX_PLAYERS; i++)
{
- fprintf(stderr,"%s: cannot access joystick device '%s'\n",
- progname,joystick_device_name[joystick_nr]);
- joystick_status = JOYSTICK_OFF;
- return;
+ char *device_name = setup.input[i].joy.device_name;
+
+ /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
+ if (stored_player[i].joystick_fd != -1)
+ {
+ close(stored_player[i].joystick_fd);
+ stored_player[i].joystick_fd = -1;
+ }
+
+ if (!setup.input[i].use_joystick)
+ continue;
+
+ if (access(device_name, R_OK) != 0)
+ {
+ Error(ERR_WARN, "cannot access joystick device '%s'", device_name);
+ continue;
+ }
+
+ if ((stored_player[i].joystick_fd = open(device_name, O_RDONLY)) < 0)
+ {
+ Error(ERR_WARN, "cannot open joystick device '%s'", device_name);
+ continue;
+ }
+
+ joystick_status = JOYSTICK_AVAILABLE;
}
- if ((joystick_device=open(joystick_device_name[joystick_nr],O_RDONLY))<0)
+#else /* MSDOS */
+
+ /* 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;
+
+ /*
+ load_joystick_data(JOYSTICK_FILENAME);
+ */
+
+ for (i=0; i<MAX_PLAYERS; i++)
{
- fprintf(stderr,"%s: cannot open joystick device '%s'\n",
- progname,joystick_device_name[joystick_nr]);
- joystick_status = JOYSTICK_OFF;
- return;
- }
+ char *device_name = setup.input[i].joy.device_name;
+ int joystick_nr = getJoystickNrFromDeviceName(device_name);
- joystick_status = JOYSTICK_AVAILABLE;
- LoadJoystickData();
-#else
- joystick_status = JOYSTICK_AVAILABLE;
+ if (joystick_nr >= num_joysticks)
+ joystick_nr = -1;
+
+ /* misuse joystick file descriptor variable to store joystick number */
+ stored_player[i].joystick_fd = joystick_nr;
+ }
#endif
}
-void InitDisplay(int argc, char *argv[])
+void InitDisplay()
{
- char *display_name = NULL;
+#ifndef MSDOS
XVisualInfo vinfo_template, *vinfo;
int num_visuals;
+#endif
unsigned int depth;
- int i;
-
- /* get X server to connect to, if given as an argument */
- for (i=1;i<argc-1;i++)
- {
- char *dispstr="-display";
- int len=MAX(strlen(dispstr),strlen(argv[i]));
-
- if (len<4)
- continue;
- else if (!strncmp(argv[i],dispstr,len))
- {
- display_name=argv[i+1];
- break;
- }
- }
/* connect to X server */
- if (!(display=XOpenDisplay(display_name)))
- {
- fprintf(stderr,"%s: cannot connect to X server %s\n",
- progname, XDisplayName(display_name));
- exit(-1);
- }
-
+ 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);
+#ifndef MSDOS
/* look for good enough visual */
vinfo_template.screen = screen;
vinfo_template.class = (depth == 8 ? PseudoColor : TrueColor);
printf("Sorry, cannot get appropriate visual.\n");
exit(-1);
}
+#endif
}
void InitWindow(int argc, char *argv[])
{
unsigned int border_width = 4;
+ XGCValues gc_values;
+ unsigned long gc_valuemask;
+#ifndef MSDOS
+ XTextProperty windowName, iconName;
Pixmap icon_pixmap, iconmask_pixmap;
- unsigned int icon_width,icon_height;
- int icon_hot_x,icon_hot_y;
+ 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;
+#endif
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);
+ const int width = WIN_XSIZE, height = WIN_YSIZE;
#ifndef MSDOS
static struct IconFileInfo icon_pic =
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;
XChangeProperty(display, window, proto_atom, XA_ATOM, 32,
PropModePrepend, (unsigned char *) &delete_atom, 1);
- sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picture_filename);
+ 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)
- {
- fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
- progname,icon_filename);
- exit(-1);
- }
+ Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
- sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picturemask_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)
- {
- fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
- progname,icon_filename);
- exit(-1);
- }
+ 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;
}
if (!XStringListToTextProperty(&window_name, 1, &windowName))
- {
- fprintf(stderr, "%s: structure allocation for windowName failed.\n",
- progname);
- exit(-1);
- }
+ Error(ERR_EXIT, "structure allocation for windowName failed");
if (!XStringListToTextProperty(&icon_name, 1, &iconName))
- {
- fprintf(stderr, "%s: structure allocation for iconName failed.\n",
- progname);
- exit(-1);
- }
+ Error(ERR_EXIT, "structure allocation for iconName failed");
wm_hints.initial_state = NormalState;
wm_hints.input = True;
wm_hints.icon_mask = iconmask_pixmap;
wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
- class_hints.res_name = progname;
+ class_hints.res_name = program_name;
class_hints.res_class = "Rocks'n'Diamonds";
XSetWMProperties(display, window, &windowName, &iconName,
}
tile_needs_clipping[] =
{
- { GFX_SPIELER_UP, 4 },
- { GFX_SPIELER_DOWN, 4 },
- { GFX_SPIELER_LEFT, 4 },
- { GFX_SPIELER_RIGHT, 4 },
- { GFX_SPIELER_PUSH_LEFT, 4 },
- { GFX_SPIELER_PUSH_RIGHT, 4 },
+ { GFX_SPIELER1_UP, 4 },
+ { GFX_SPIELER1_DOWN, 4 },
+ { GFX_SPIELER1_LEFT, 4 },
+ { GFX_SPIELER1_RIGHT, 4 },
+ { GFX_SPIELER1_PUSH_LEFT, 4 },
+ { GFX_SPIELER1_PUSH_RIGHT, 4 },
+ { GFX_SPIELER2_UP, 4 },
+ { GFX_SPIELER2_DOWN, 4 },
+ { GFX_SPIELER2_LEFT, 4 },
+ { GFX_SPIELER2_RIGHT, 4 },
+ { GFX_SPIELER2_PUSH_LEFT, 4 },
+ { GFX_SPIELER2_PUSH_RIGHT, 4 },
+ { GFX_SPIELER3_UP, 4 },
+ { GFX_SPIELER3_DOWN, 4 },
+ { GFX_SPIELER3_LEFT, 4 },
+ { GFX_SPIELER3_RIGHT, 4 },
+ { GFX_SPIELER3_PUSH_LEFT, 4 },
+ { GFX_SPIELER3_PUSH_RIGHT, 4 },
+ { GFX_SPIELER4_UP, 4 },
+ { GFX_SPIELER4_DOWN, 4 },
+ { GFX_SPIELER4_LEFT, 4 },
+ { GFX_SPIELER4_RIGHT, 4 },
+ { GFX_SPIELER4_PUSH_LEFT, 4 },
+ { GFX_SPIELER4_PUSH_RIGHT, 4 },
{ GFX_GEBLUBBER, 4 },
{ GFX_DYNAMIT, 7 },
{ GFX_DYNABOMB, 4 },
+ { GFX_EXPLOSION, 8 },
{ GFX_SOKOBAN_OBJEKT, 1 },
- { GFX_MASK_SPARKLING, 3 },
+ { GFX_FUNKELN_BLAU, 3 },
+ { GFX_FUNKELN_WEISS, 3 },
{ -1, 0 }
};
-#ifdef DEBUG_TIMING
- long count1, count2;
- count1 = Counter();
+#if DEBUG_TIMING
+ debug_print_timestamp(0, NULL); /* initialize timestamp function */
#endif
LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
#ifdef MSDOS
DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
rest(200);
-#endif MSDOS
+#endif /* MSDOS */
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);
+#if DEBUG_TIMING
+ debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:");
#endif
-
pix[PIX_DB_BACK] = XCreatePixmap(display, window,
WIN_XSIZE,WIN_YSIZE,
XDefaultDepth(display,screen));
int src_x, src_y;
Pixmap src_pixmap;
- if (tile_needs_clipping[i].start == GFX_MASK_SPARKLING)
- {
- /* special case -- should be cleaned up sometimes... */
- src_pixmap = clipmask[PIX_BACK];
- src_x = SX + GFX_PER_LINE*TILEX;
- src_y = SY + j*TILEY;
- }
- else if (graphic >= GFX_START_ROCKSSCREEN &&
- graphic <= GFX_END_ROCKSSCREEN)
+ if (graphic >= GFX_START_ROCKSSCREEN &&
+ graphic <= GFX_END_ROCKSSCREEN)
{
src_pixmap = clipmask[PIX_BACK];
graphic -= GFX_START_ROCKSSCREEN;
}
if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
- {
- fprintf(stderr, "%s: cannot create additional Pixmaps!\n",progname);
- CloseAll();
- exit(-1);
- }
+ Error(ERR_EXIT, "cannot create additional pixmaps");
- for(i=0;i<NUM_PIXMAPS;i++)
+ for(i=0; i<NUM_PIXMAPS; i++)
{
if (clipmask[i])
{
char basefilename[256];
char filename[256];
-#ifdef XPM_INCLUDE_FILE
+#ifdef USE_XPM_LIBRARY
int xpm_err, xbm_err;
unsigned int width,height;
int hot_x,hot_y;
char *picture_ext = ".xpm";
char *picturemask_ext = "Mask.xbm";
#else
- int gif_err;
- char *picture_ext = ".gif";
-#endif
-
-#ifdef DEBUG_TIMING
- long count1, count2;
+ int pcx_err;
+ char *picture_ext = ".pcx";
#endif
/* Grafik laden */
if (pic->picture_filename)
{
- sprintf(basefilename,"%s%s",pic->picture_filename,picture_ext);
- DrawInitText(basefilename,150,FC_YELLOW);
- sprintf(filename,"%s/%s",GFX_PATH,basefilename);
+ 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);
#ifdef MSDOS
rest(100);
-#endif MSDOS
+#endif /* MSDOS */
-#ifdef DEBUG_TIMING
- count1 = Counter();
+#if DEBUG_TIMING
+ debug_print_timestamp(1, NULL); /* initialize timestamp function */
#endif
-#ifdef XPM_INCLUDE_FILE
+#ifdef USE_XPM_LIBRARY
xpm_att[pos].valuemask = XpmCloseness;
xpm_att[pos].closeness = 20000;
xpm_err = XpmReadFileToPixmap(display,window,filename,
&pix[pos],&shapemask,&xpm_att[pos]);
-
switch(xpm_err)
{
case XpmOpenFailed:
- fprintf(stderr,"Cannot open Xpm file '%s' !\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
case XpmFileInvalid:
- fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "invalid XPM file '%s'", filename);
case XpmNoMemory:
- fprintf(stderr,"Not enough memory for Xpm file '%s'!\n",filename);
- CloseAll();
- exit(1);
+ Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
case XpmColorFailed:
- fprintf(stderr,"Can't get colors for Xpm file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
default:
break;
}
-#ifdef DEBUG_TIMING
- count2 = Counter();
- printf("XPM LOADING %s IN %.2f SECONDS\n",
- filename,(float)(count2-count1)/1000.0);
+#if DEBUG_TIMING
+ printf("LOADING XPM FILE %s:", filename);
+ debug_print_timestamp(1, "");
#endif
-#else
-
- gif_err = Read_GIF_to_Pixmaps(display, window, filename,
- &pix[pos], &clipmask[pos]);
+#else /* !USE_XPM_LIBRARY */
- switch(gif_err)
+ pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename,
+ &pix[pos], &clipmask[pos]);
+ switch(pcx_err)
{
- case GIF_Success:
+ case PCX_Success:
break;
- case GIF_OpenFailed:
- fprintf(stderr,"Cannot open GIF file '%s' !\n",filename);
- CloseAll();
- exit(-1);
- case GIF_ReadFailed:
- fprintf(stderr,"Cannot read GIF file '%s' !\n",filename);
- CloseAll();
- exit(-1);
- case GIF_FileInvalid:
- fprintf(stderr,"Invalid GIF file '%s'!\n",filename);
- CloseAll();
- exit(-1);
- case GIF_NoMemory:
- fprintf(stderr,"Not enough memory for GIF file '%s'!\n",filename);
- CloseAll();
- exit(1);
- case GIF_ColorFailed:
- fprintf(stderr,"Can't get colors for GIF file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ 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);
+#if DEBUG_TIMING
+ printf("SUMMARY LOADING PCX FILE %s:", filename);
+ debug_print_timestamp(1, "");
#endif
-#endif
+#endif /* !USE_XPM_LIBRARY */
if (!pix[pos])
- {
- fprintf(stderr, "%s: cannot get graphics for '%s'.\n",
- progname, pic->picture_filename);
- CloseAll();
- exit(-1);
- }
+ Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
}
/* zugehörige Maske laden (wenn vorhanden) */
if (pic->picture_with_mask)
{
+#ifdef USE_XPM_LIBRARY
-#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);
- sprintf(basefilename,"%s%s",pic->picture_filename,picturemask_ext);
- DrawInitText(basefilename,150,FC_YELLOW);
- sprintf(filename,"%s/%s",GFX_PATH,basefilename);
-
-#ifdef DEBUG_TIMING
- count1 = Counter();
+#if DEBUG_TIMING
+ debug_print_timestamp(1, NULL); /* initialize timestamp function */
#endif
xbm_err = XReadBitmapFile(display,window,filename,
&width,&height,&clipmask[pos],&hot_x,&hot_y);
-
switch(xbm_err)
{
case BitmapSuccess:
break;
case BitmapOpenFailed:
- fprintf(stderr,"Bitmap file open failed on '%s' !\n",filename);
- CloseAll();
- exit(-1);
- break;
+ Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
case BitmapFileInvalid:
- fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
- CloseAll();
- exit(-1);
- break;
+ Error(ERR_EXIT, "invalid XBM file '%s'", filename);
case BitmapNoMemory:
- fprintf(stderr,"No memory for file '%s' !\n",filename);
- CloseAll();
- exit(-1);
+ 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);
+#if DEBUG_TIMING
+ printf("LOADING XBM FILE %s:", filename);
+ debug_print_timestamp(1, "");
#endif
-#endif
+#endif /* USE_XPM_LIBRARY */
if (!clipmask[pos])
- {
- fprintf(stderr, "%s: cannot get clipmask for '%s'.\n",
- progname, pic->picture_filename);
- CloseAll();
- exit(-1);
- }
+ Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
}
}
EL_BETON,
EL_MAUERWERK,
EL_MAUER_LEBT,
+ EL_MAUER_X,
+ EL_MAUER_Y,
+ EL_MAUER_XY,
EL_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
EL_MAUERWERK,
EL_FELSBODEN,
EL_MAUER_LEBT,
+ EL_MAUER_X,
+ EL_MAUER_Y,
+ EL_MAUER_XY,
EL_MAUERND
};
static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
};
static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
+ static int ep_player[] =
+ {
+ EL_SPIELFIGUR,
+ EL_SPIELER1,
+ EL_SPIELER2,
+ EL_SPIELER3,
+ EL_SPIELER4
+ };
+ static int ep_player_num = sizeof(ep_player)/sizeof(int);
+
static long ep_bit[] =
{
EP_BIT_AMOEBALIVE,
EP_BIT_INACTIVE,
EP_BIT_EXPLOSIVE,
EP_BIT_MAMPF3,
- EP_BIT_PUSHABLE
+ EP_BIT_PUSHABLE,
+ EP_BIT_PLAYER
};
static int *ep_array[] =
{
ep_inactive,
ep_explosive,
ep_mampf3,
- ep_pushable
+ ep_pushable,
+ ep_player
};
static int *ep_num[] =
{
&ep_inactive_num,
&ep_explosive_num,
&ep_mampf3_num,
- &ep_pushable_num
+ &ep_pushable_num,
+ &ep_player_num
};
static int num_properties = sizeof(ep_num)/sizeof(int *);
- for(i=0;i<MAX_ELEMENTS;i++)
+ for(i=0; i<MAX_ELEMENTS; i++)
Elementeigenschaften[i] = 0;
- for(i=0;i<num_properties;i++)
- for(j=0;j<*(ep_num[i]);j++)
+ 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++)
+ for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
-void CloseAll()
+void CloseAllAndExit(int exit_value)
{
int i;
FreeSounds(NUM_SOUNDS);
}
- for(i=0;i<NUM_PIXMAPS;i++)
+ for(i=0; i<NUM_PIXMAPS; i++)
{
if (pix[i])
{
-#ifdef XPM_INCLUDE_FILE
- if (i<NUM_PICTURES) /* XPM pictures */
+#ifdef USE_XPM_LIBRARY
+ if (i < NUM_PICTURES) /* XPM pictures */
{
XFreeColors(display,DefaultColormap(display,screen),
xpm_att[i].pixels,xpm_att[i].npixels,0);
XCloseDisplay(display);
}
- exit(0);
+#ifdef MSDOS
+ dumpErrorFile();
+#endif
+
+ exit(exit_value);
}
projects / rocksndiamonds.git / blobdiff