projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981010-1
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 7a6057a79ad948320c4057282fc244b1a1b6eaba..ecafc3b848cc3932394cf38ebf9184248b621782 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-44,11
+44,11
@@
struct IconFileInfo
static int sound_process_id = 0;
static int sound_process_id = 0;
-static void InitServer(void);
static void InitLevelAndPlayerInfo(void);
static void InitLevelAndPlayerInfo(void);
+static void InitNetworkServer(void);
static void InitDisplay(void);
static void InitSound(void);
static void InitDisplay(void);
static void InitSound(void);
-static void InitSound
Process
(void);
+static void InitSound
Server
(void);
static void InitWindow(int, char **);
static void InitGfx(void);
static void LoadGfx(int, struct PictureFileInfo *);
static void InitWindow(int, char **);
static void InitGfx(void);
static void LoadGfx(int, struct PictureFileInfo *);
@@
-57,16
+57,15
@@
static void InitElementProperties(void);
void OpenAll(int argc, char *argv[])
{
InitLevelAndPlayerInfo();
void OpenAll(int argc, char *argv[])
{
InitLevelAndPlayerInfo();
- InitServer();
InitCounter();
InitSound();
InitCounter();
InitSound();
- InitSound
Process
();
+ InitSound
Server
();
InitJoystick();
InitRND(NEW_RANDOMIZE);
InitJoystick();
InitRND(NEW_RANDOMIZE);
- signal(SIGINT, CloseAll);
- signal(SIGTERM, CloseAll);
+ signal(SIGINT, CloseAll
AndExit
);
+ signal(SIGTERM, CloseAll
AndExit
);
InitDisplay();
InitWindow(argc, argv);
InitDisplay();
InitWindow(argc, argv);
@@
-78,6
+77,8
@@
void OpenAll(int argc, char *argv[])
InitElementProperties();
DrawMainMenu();
InitElementProperties();
DrawMainMenu();
+
+ InitNetworkServer();
}
void InitLevelAndPlayerInfo()
}
void InitLevelAndPlayerInfo()
@@
-85,31
+86,36
@@
void InitLevelAndPlayerInfo()
local_player = &stored_player[0];
if (!LoadLevelInfo()) /* global level info */
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 */
}
LoadPlayerInfo(PLAYER_SETUP); /* global setup info */
LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */
}
-void InitServer()
+void Init
Network
Server()
{
{
-
standalone = FALSE + TRUE
;
+
int nr_wanted
;
if (standalone)
return;
if (standalone)
return;
+ nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+
if (!ConnectToServer(server_host, server_port))
Error(ERR_EXIT, "cannot connect to multiplayer server");
if (!ConnectToServer(server_host, server_port))
Error(ERR_EXIT, "cannot connect to multiplayer server");
- SendNicknameToServer(local_player->alias_name);
- SendProtocolVersionToServer();
+ SendToServer_Nickname(local_player->alias_name);
+ SendToServer_ProtocolVersion();
+
+ if (nr_wanted)
+ SendToServer_NrWanted(nr_wanted);
}
void InitSound()
{
int i;
}
void InitSound()
{
int i;
- if (sound_status
==
SOUND_OFF)
+ if (sound_status
==
SOUND_OFF)
return;
#ifndef MSDOS
return;
#ifndef MSDOS
@@
-120,7
+126,7
@@
void InitSound()
return;
}
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");
sound_status = SOUND_OFF;
{
Error(ERR_RETURN, "cannot open sound device - no sounds");
sound_status = SOUND_OFF;
@@
-128,7
+134,7
@@
void InitSound()
}
close(sound_device);
}
close(sound_device);
- sound_status
=
SOUND_AVAILABLE;
+ sound_status
=
SOUND_AVAILABLE;
#ifdef VOXWARE
sound_loops_allowed = TRUE;
#ifdef VOXWARE
sound_loops_allowed = TRUE;
@@
-139,7
+145,7
@@
void InitSound()
sound_loops_on = TRUE;
#endif
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);
{
#ifdef MSDOS
sprintf(sound_name[i], "%d", i+1);
@@
-147,34
+153,39
@@
void InitSound()
Sound[i].name = sound_name[i];
if (!LoadSound(&Sound[i]))
{
Sound[i].name = sound_name[i];
if (!LoadSound(&Sound[i]))
{
- sound_status
=
SOUND_OFF;
+ sound_status
=
SOUND_OFF;
return;
}
}
}
return;
}
}
}
-void InitSound
Process
()
+void InitSound
Server
()
{
{
- 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");
return;
#ifndef MSDOS
if (pipe(sound_pipe)<0)
{
Error(ERR_RETURN, "cannot create pipe - no sounds");
- sound_status
=
SOUND_OFF;
+ sound_status
=
SOUND_OFF;
return;
}
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_RETURN, "cannot create
sound server
process - no sounds");
+ sound_status
=
SOUND_OFF;
return;
}
if (!sound_process_id) /* we are child */
return;
}
if (!sound_process_id) /* we are child */
+ {
SoundServer();
SoundServer();
+
+ /* never reached */
+ exit(0);
+ }
else /* we are parent */
close(sound_pipe[0]); /* no reading from pipe needed */
#else
else /* we are parent */
close(sound_pipe[0]); /* no reading from pipe needed */
#else
@@
-184,7
+195,7
@@
void InitSoundProcess()
void InitJoystick()
{
void InitJoystick()
{
- if (global_joystick_status
==
JOYSTICK_OFF)
+ if (global_joystick_status
==
JOYSTICK_OFF)
return;
#ifndef MSDOS
return;
#ifndef MSDOS
@@
-196,7
+207,7
@@
void InitJoystick()
return;
}
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'",
joystick_device_name[joystick_nr]);
{
Error(ERR_RETURN, "cannot open joystick device '%s'",
joystick_device_name[joystick_nr]);
@@
-438,6
+449,7
@@
void InitGfx()
{ GFX_GEBLUBBER, 4 },
{ GFX_DYNAMIT, 7 },
{ GFX_DYNABOMB, 4 },
{ GFX_GEBLUBBER, 4 },
{ GFX_DYNAMIT, 7 },
{ GFX_DYNABOMB, 4 },
+ { GFX_EXPLOSION, 8 },
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
@@
-540,7
+552,7
@@
void InitGfx()
if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
Error(ERR_EXIT, "cannot create additional pixmaps");
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])
{
{
if (clipmask[i])
{
@@
-615,21
+627,13
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
switch(xpm_err)
{
case XpmOpenFailed:
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:
case XpmFileInvalid:
- fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
- CloseAll();
- exit(-1);
+ Error(ERR_EXIT, "invalid XPM file '%s'", filename);
case XpmNoMemory:
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:
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;
}
default:
break;
}
@@
-650,25
+654,15
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
case GIF_Success:
break;
case GIF_OpenFailed:
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:
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:
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:
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:
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;
}
default:
break;
}
@@
-707,19
+701,11
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
case BitmapSuccess:
break;
case BitmapOpenFailed:
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:
case BitmapFileInvalid:
- fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
- CloseAll();
- exit(-1);
- break;
+ Error(ERR_EXIT, "invalid XBM file '%s'", filename);
case BitmapNoMemory:
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;
break;
default:
break;
@@
-788,6
+774,9
@@
void InitElementProperties()
EL_BETON,
EL_MAUERWERK,
EL_MAUER_LEBT,
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_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
@@
-889,6
+878,9
@@
void InitElementProperties()
EL_MAUERWERK,
EL_FELSBODEN,
EL_MAUER_LEBT,
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);
EL_MAUERND
};
static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
@@
-1276,17
+1268,17
@@
void InitElementProperties()
};
static int num_properties = sizeof(ep_num)/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;
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];
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);
}
Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
-void CloseAll
(
)
+void CloseAll
AndExit(int exit_value
)
{
int i;
{
int i;
@@
-1297,7
+1289,7
@@
void CloseAll()
FreeSounds(NUM_SOUNDS);
}
FreeSounds(NUM_SOUNDS);
}
- for(i=0;
i<NUM_PIXMAPS;
i++)
+ for(i=0;
i<NUM_PIXMAPS;
i++)
{
if (pix[i])
{
{
if (pix[i])
{
@@
-1326,5
+1318,5
@@
void CloseAll()
XCloseDisplay(display);
}
XCloseDisplay(display);
}
- exit(
0
);
+ exit(
exit_value
);
}
}