X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=6931936ee00a902d1aa55ba437dfa8dba5d5fa95;hb=59c2e609872b70cb4c458004cd9e2fe22c86a54b;hp=7a6057a79ad948320c4057282fc244b1a1b6eaba;hpb=29014045f4de045f8452fdf7ab32622c94b37eef;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 7a6057a7..6931936e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -23,6 +23,7 @@
 #include "gfxload.h"
 #include "gifload.h"
 #include "network.h"
+#include "netserv.h"
 
 #ifdef DEBUG
 /*
@@ -44,11 +45,11 @@ 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 *);
@@ -56,17 +57,24 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
+  if (serveronly)
+  {
+    NetworkServer(server_port, 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();
   InitWindow(argc, argv);
@@ -78,6 +86,8 @@ void OpenAll(int argc, char *argv[])
   InitElementProperties();
 
   DrawMainMenu();
+
+  InitNetworkServer();
 }
 
 void InitLevelAndPlayerInfo()
@@ -85,31 +95,36 @@ void InitLevelAndPlayerInfo()
   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 */
 }
 
-void InitServer()
+void InitNetworkServer()
 {
-  standalone = FALSE + TRUE;
+  int nr_wanted;
 
-  if (standalone)
+  if (!network)
     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");
 
-  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;
 
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
 #ifndef MSDOS
@@ -120,7 +135,7 @@ void InitSound()
     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;
@@ -128,7 +143,7 @@ void InitSound()
   }
 
   close(sound_device);
-  sound_status=SOUND_AVAILABLE;
+  sound_status = SOUND_AVAILABLE;
 
 #ifdef VOXWARE
   sound_loops_allowed = TRUE;
@@ -139,7 +154,7 @@ void InitSound()
   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);
@@ -147,34 +162,39 @@ void InitSound()
     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;
+    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_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
@@ -184,7 +204,7 @@ void InitSoundProcess()
 
 void InitJoystick()
 {
-  if (global_joystick_status==JOYSTICK_OFF)
+  if (global_joystick_status == JOYSTICK_OFF)
     return;
 
 #ifndef MSDOS
@@ -196,7 +216,7 @@ void InitJoystick()
     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]);
@@ -438,6 +458,7 @@ void InitGfx()
     { GFX_GEBLUBBER, 4 },
     { GFX_DYNAMIT, 7 },
     { GFX_DYNABOMB, 4 },
+    { GFX_EXPLOSION, 8 },
     { GFX_SOKOBAN_OBJEKT, 1 },
     { GFX_FUNKELN_BLAU, 3 },
     { GFX_FUNKELN_WEISS, 3 },
@@ -540,7 +561,7 @@ void InitGfx()
   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])
     {
@@ -615,21 +636,13 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
     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;
     }
@@ -650,25 +663,15 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
       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;
     }
@@ -707,19 +710,11 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
       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;
@@ -788,6 +783,9 @@ void InitElementProperties()
     EL_BETON,
     EL_MAUERWERK,
     EL_MAUER_LEBT,
+    EL_MAUER_X,
+    EL_MAUER_Y,
+    EL_MAUER_XY,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -889,6 +887,9 @@ void InitElementProperties()
     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);
@@ -1276,17 +1277,17 @@ void InitElementProperties()
   };
   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;
 
@@ -1297,7 +1298,7 @@ void CloseAll()
     FreeSounds(NUM_SOUNDS);
   }
 
-  for(i=0;i<NUM_PIXMAPS;i++)
+  for(i=0; i<NUM_PIXMAPS; i++)
   {
     if (pix[i])
     {
@@ -1326,5 +1327,5 @@ void CloseAll()
     XCloseDisplay(display);
   }
 
-  exit(0);
+  exit(exit_value);
 }