#include "gfxload.h"
#include "gifload.h"
#include "network.h"
+#include "netserv.h"
#ifdef DEBUG
/*
struct PictureFileInfo
{
char *picture_filename;
- BOOL picture_with_mask;
+ boolean picture_with_mask;
};
struct IconFileInfo
static int sound_process_id = 0;
-static void InitServer(void);
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();
- InitServer();
InitCounter();
InitSound();
- InitSoundProcess();
+ InitSoundServer();
InitJoystick();
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()
{
+ int i;
+
+ /* initialize local player's setup */
+ setup.sound_on = TRUE;
+ setup.sound_loops_on = FALSE;
+ setup.sound_music_on = FALSE;
+ setup.sound_simple_on = FALSE;
+ setup.toons_on = TRUE;
+ setup.direct_draw_on = FALSE;
+ setup.scroll_delay_on = FALSE;
+ setup.soft_scrolling_on = TRUE;
+ setup.fading_on = FALSE;
+ setup.autorecord_on = FALSE;
+ setup.quick_doors = FALSE;
+ setup.joystick_nr = 0;
+
+ /* choose default local player */
local_player = &stored_player[0];
if (!LoadLevelInfo()) /* global level info */
- CloseAll();
+ Error(ERR_EXIT, NULL);
LoadPlayerInfo(PLAYER_SETUP); /* global setup info */
LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */
+
+ /* after LoadPlayerInfo(), because it overwrites 'local_player' */
+ for (i=0; i<MAX_PLAYERS; i++)
+ {
+ stored_player[i].connected = FALSE;
+ stored_player[i].local = FALSE;
+ }
+ local_player->connected = TRUE;
+ local_player->local = TRUE;
}
-void InitServer()
+void InitNetworkServer()
{
- standalone = FALSE;
+ int nr_wanted;
- if (standalone)
+ if (!options.network)
return;
- if (!ConnectToServer(server_host, server_port))
- {
- fprintf(stderr,"%s: cannot connect to multiplayer server.\n",
- progname);
- exit(-1);
- }
+ nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
- SendNicknameToServer(local_player->alias_name);
- SendProtocolVersionToServer();
+ if (!ConnectToServer(options.server_host, options.server_port))
+ Error(ERR_EXIT, "cannot connect to multiplayer server");
+
+ SendToServer_Nickname(local_player->alias_name);
+ SendToServer_ProtocolVersion();
+
+ if (nr_wanted)
+ SendToServer_NrWanted(nr_wanted);
}
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)
{
- fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname);
- sound_status=SOUND_OFF;
+ Error(ERR_RETURN, "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_RETURN, "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
sound_loops_allowed = TRUE;
- sound_loops_on = TRUE;
+ setup.sound_loops_on = TRUE;
#endif
- for(i=0;i<NUM_SOUNDS;i++)
+ for(i=0; i<NUM_SOUNDS; i++)
{
#ifdef MSDOS
sprintf(sound_name[i], "%d", i+1);
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_RETURN, "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_RETURN, "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
void InitJoystick()
{
- if (global_joystick_status==JOYSTICK_OFF)
+ if (global_joystick_status == JOYSTICK_OFF)
return;
#ifndef MSDOS
- if (access(joystick_device_name[joystick_nr],R_OK)<0)
+ if (access(joystick_device_name[setup.joystick_nr], R_OK) < 0)
{
- fprintf(stderr,"%s: cannot access joystick device '%s'\n",
- progname,joystick_device_name[joystick_nr]);
+ Error(ERR_RETURN, "cannot access joystick device '%s'",
+ joystick_device_name[setup.joystick_nr]);
joystick_status = JOYSTICK_OFF;
return;
}
- if ((joystick_device=open(joystick_device_name[joystick_nr],O_RDONLY))<0)
+ if ((joystick_device =
+ open(joystick_device_name[setup.joystick_nr], O_RDONLY)) < 0)
{
- fprintf(stderr,"%s: cannot open joystick device '%s'\n",
- progname,joystick_device_name[joystick_nr]);
+ Error(ERR_RETURN, "cannot open joystick device '%s'",
+ joystick_device_name[setup.joystick_nr]);
joystick_status = JOYSTICK_OFF;
return;
}
#endif
}
-void InitDisplay(int argc, char *argv[])
+void InitDisplay()
{
- char *display_name = NULL;
XVisualInfo vinfo_template, *vinfo;
int num_visuals;
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);
&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);
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,
{ GFX_GEBLUBBER, 4 },
{ GFX_DYNAMIT, 7 },
{ GFX_DYNABOMB, 4 },
+ { GFX_EXPLOSION, 8 },
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
}
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])
{
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;
}
case GIF_Success:
break;
case GIF_OpenFailed:
- fprintf(stderr,"Cannot open GIF file '%s' !\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "cannot open GIF file '%s'", filename);
case GIF_ReadFailed:
- fprintf(stderr,"Cannot read GIF file '%s' !\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "cannot read GIF file '%s'", filename);
case GIF_FileInvalid:
- fprintf(stderr,"Invalid GIF file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "invalid GIF file '%s'", filename);
case GIF_NoMemory:
- fprintf(stderr,"Not enough memory for GIF file '%s'!\n",filename);
- CloseAll();
- exit(1);
+ Error(ERR_EXIT, "not enough memory for GIF file '%s'", filename);
case GIF_ColorFailed:
- fprintf(stderr,"Can't get colors for GIF file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "cannot get colors for GIF file '%s'", filename);
default:
break;
}
#endif
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) */
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;
#endif
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 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])
{
XCloseDisplay(display);
}
- exit(0);
+ exit(exit_value);
}
projects / rocksndiamonds.git / blobdiff