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

diff --git a/src/init.c b/src/init.c
index c6cd0da3..6931936e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,17 +1,18 @@
 /***********************************************************
 *  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"
@@ -21,8 +22,8 @@
 #include "joystick.h"
 #include "gfxload.h"
 #include "gifload.h"
-
-#include <signal.h>
+#include "network.h"
+#include "netserv.h"
 
 #ifdef DEBUG
 /*
@@ -45,9 +46,10 @@ 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 *);
@@ -55,18 +57,26 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
+  if (serveronly)
+  {
+    NetworkServer(server_port, serveronly);
+
+    /* never reached */
+    exit(0);
+  }
+
   InitLevelAndPlayerInfo();
 
   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);
@@ -76,43 +86,64 @@ void OpenAll(int argc, char *argv[])
   InitElementProperties();
 
   DrawMainMenu();
+
+  InitNetworkServer();
 }
 
 void InitLevelAndPlayerInfo()
 {
-  player = local_player = &stored_player[0];
+  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 InitNetworkServer()
+{
+  int nr_wanted;
+
+  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");
+
+  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;
@@ -123,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);
@@ -131,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)
   {
-    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
@@ -168,22 +204,22 @@ void InitSoundProcess()
 
 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)
   {
-    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[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)
   {
-    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[joystick_nr]);
     joystick_status = JOYSTICK_OFF;
     return;
   }
@@ -195,37 +231,16 @@ void InitJoystick()
 #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(display_name)))
+    Error(ERR_EXIT,"cannot connect to X server %s",XDisplayName(display_name));
+
   screen = DefaultScreen(display);
   visual = DefaultVisual(display, screen);
   depth  = DefaultDepth(display, screen);
@@ -312,22 +327,14 @@ void InitWindow(int argc, char *argv[])
 		  &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;
@@ -341,18 +348,10 @@ void InitWindow(int argc, char *argv[])
   }
 
   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;
@@ -360,7 +359,7 @@ void InitWindow(int argc, char *argv[])
   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, 
@@ -432,17 +431,37 @@ void InitGfx()
   }
   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 }
   };
 
@@ -504,15 +523,8 @@ void InitGfx()
       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;
@@ -547,13 +559,9 @@ void InitGfx()
   }
 
   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])
     {
@@ -628,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;
     }
@@ -663,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;
     }
@@ -695,12 +685,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
 #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) */
@@ -725,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;
@@ -752,12 +729,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
 #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);
   }
 }
 
@@ -811,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,
@@ -912,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);
@@ -1299,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;
 
@@ -1320,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])
     {
@@ -1349,5 +1327,5 @@ void CloseAll()
     XCloseDisplay(display);
   }
 
-  exit(0);
+  exit(exit_value);
 }