#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 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);
InitElementProperties();
DrawMainMenu();
+
+ InitNetworkServer();
}
void InitLevelAndPlayerInfo()
{
+ int i;
+
+ /* choose default local player */
local_player = &stored_player[0];
+ for (i=0; i<MAX_PLAYERS; i++)
+ stored_player[i].connected = FALSE;
+ local_player->connected = TRUE;
if (!LoadLevelInfo()) /* global level info */
Error(ERR_EXIT, NULL);
- LoadPlayerInfo(PLAYER_SETUP); /* global setup info */
- LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */
+ LoadSetup(); /* global setup info */
+ LoadLevelSetup(); /* info about last played level */
}
-void InitServer()
+void InitNetworkServer()
{
- standalone = FALSE;
- networking = !standalone;
+ int nr_wanted;
- if (standalone)
+ if (!options.network)
return;
- if (!ConnectToServer(server_host, server_port))
+ 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");
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)
{
- Error(ERR_RETURN, "cannot access sound device - no sounds");
+ 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)
{
- Error(ERR_RETURN, "cannot open sound device - no sounds");
+ 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
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)
{
- Error(ERR_RETURN, "cannot create pipe - no sounds");
- 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)
{
- Error(ERR_RETURN, "cannot create child process - no sounds");
- 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
void InitJoystick()
{
- if (global_joystick_status==JOYSTICK_OFF)
+ int joystick_nr = setup.input[0].joystick_nr;
+
+ if (global_joystick_status == JOYSTICK_OFF)
return;
#ifndef MSDOS
- if (access(joystick_device_name[joystick_nr],R_OK)<0)
+ if (access(joystick_device_name[joystick_nr], R_OK) < 0)
{
- Error(ERR_RETURN, "cannot access joystick device '%s'",
+ Error(ERR_WARN, "cannot access joystick device '%s'",
joystick_device_name[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[joystick_nr], O_RDONLY)) < 0)
{
- Error(ERR_RETURN, "cannot open joystick device '%s'",
+ Error(ERR_WARN, "cannot open joystick device '%s'",
joystick_device_name[joystick_nr]);
joystick_status = JOYSTICK_OFF;
return;
unsigned int depth;
/* connect to X server */
- if (!(display = XOpenDisplay(display_name)))
- Error(ERR_EXIT,"cannot connect to X server %s",XDisplayName(display_name));
+ 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);
if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
Error(ERR_EXIT, "cannot create additional pixmaps");
- for(i=0;i<NUM_PIXMAPS;i++)
+ for(i=0; i<NUM_PIXMAPS; i++)
{
if (clipmask[i])
{
};
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);
}
FreeSounds(NUM_SOUNDS);
}
- for(i=0;i<NUM_PIXMAPS;i++)
+ for(i=0; i<NUM_PIXMAPS; i++)
{
if (pix[i])
{
projects / rocksndiamonds.git / blobdiff