rnd-19980930-1

diff --git a/src/Makefile b/src/Makefile
index 9f912dc8c81852d0c28fc86936bc34a8eac1b354..8b9de78660f8dc893e2aa85f32763186338cc7ba 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,7 @@
 #
 
 PROGNAME = rocksndiamonds
+SERVNAME = rnd_server
 
 RM = rm -f
 CC = gcc
@@ -87,9 +88,14 @@ OBJS =       main.o          \
        new.o           \
        random.o
 
-all:   $(OBJS)
+all:   $(PROGNAME) $(SERVNAME)
+
+$(PROGNAME):   $(OBJS)
        $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(PROGNAME)
 
+$(SERVNAME):   $(SERVNAME).c
+       $(CC) $(CFLAGS) $(SERVNAME).c $(LIBS) -o $(SERVNAME)
+
 .c.o:
        $(CC) $(CFLAGS) -c $*.c
 

diff --git a/src/buttons.c b/src/buttons.c
index dc4860e008ed8f135d0c1ab7d01594b4758d079a..8077b03acac3894276596da2452a47812cf88e59 100644 (file)
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  buttons.c                                               *
 ***********************************************************/

diff --git a/src/buttons.h b/src/buttons.h
index 7d4153c1d39c47fe49b8dcc0dd7ec0c94ecf472a..397aa6f9be2283ae6737c90f95a06f79e1654fd7 100644 (file)
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  buttons.h                                               *
 ***********************************************************/

diff --git a/src/cartoons.c b/src/cartoons.c
index 8aee8a261633890fb2640692db382286a762df41..9eef8e1e075a148b4aae99c6889af6ba0a09c61b 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  cartoons.c                                              *
 ***********************************************************/

diff --git a/src/cartoons.h b/src/cartoons.h
index 25b4d2c41313df9c1e51234974121726faebf34c..fdde0cbc86789a1070a3d1cd78ab78a113e75fd1 100644 (file)
--- a/src/cartoons.h
+++ b/src/cartoons.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  cartoons.h                                              *
 ***********************************************************/

diff --git a/src/editor.c b/src/editor.c
index ae7e7e8cb5d95671148d68115d1eb987c0adf62f..3434b4c2219731c842b9c7eadc82276f21d7b07e 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  editor.c                                                *
 ***********************************************************/

diff --git a/src/editor.h b/src/editor.h
index b4ebfed2e03d6324d2e11226eebb45c50a3392c3..b282fe4bb754d65805de1194ee48c7ba433f3972 100644 (file)
--- a/src/editor.h
+++ b/src/editor.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  editor.h                                                *
 ***********************************************************/

diff --git a/src/events.c b/src/events.c
index ff86409e640952345561ebeacf78ece8163d1eb3..d0684ed3d220061fbcb3076b55b6ddd1c97054b2 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  events.c                                                *
 ***********************************************************/

diff --git a/src/events.h b/src/events.h
index 88c627d97bc78dca8daface2def81a200c657d50..ccf604c38ae062c1bdd53e5e51a017d29d150263 100644 (file)
--- a/src/events.h
+++ b/src/events.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  events.h                                                *
 ***********************************************************/

diff --git a/src/files.c b/src/files.c
index 284ed51fc0c7a8099d7834c099b903756e8de1b2..9e35c06009c35736d877fc900bd77cdeec02c214 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  files.h                                                 *
 ***********************************************************/

diff --git a/src/files.h b/src/files.h
index e34532a171087f7b1e870a5bb5dcc63e893b2510..c0050d3615d0e65eb340c3f31fc6504b8981de04 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  files.h                                                 *
 ***********************************************************/

diff --git a/src/game.c b/src/game.c
index 86d83660ce7baec0059ee2edc0219758492807b2..3392e0ec441dc340dd7079932825f91896d253e1 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  game.c                                                  *
 ***********************************************************/

diff --git a/src/game.h b/src/game.h
index 9cf6a29719430015c3f79e9b254acdc9f4603244..fce926030bcb7489bc8ae610e9d7d5e7184a8654 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  game.h                                                  *
 ***********************************************************/

diff --git a/src/gfxload.c b/src/gfxload.c
index 05e72a157c2504c4e768c758dc9ad0a36971ca3f..bcc7f221445e3f7476fb74e5e7d6e95dd2258c6e 100644 (file)
--- a/src/gfxload.c
+++ b/src/gfxload.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  gfxload.c                                               *
 ***********************************************************/

diff --git a/src/gfxload.h b/src/gfxload.h
index 654dacdb9102b19543bc2fa08ff600835336b85c..7489447e7f33f0914cf85889e1253b0a44c18407 100644 (file)
--- a/src/gfxload.h
+++ b/src/gfxload.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  gfxload.h                                               *
 ***********************************************************/

diff --git a/src/gifload.c b/src/gifload.c
index ac64df6aba0a0ce9c79877fda0a4496c1f2a4de1..1e1aebcd43cb3706f9594a2c0ee0b9890300a941 100644 (file)
--- a/src/gifload.c
+++ b/src/gifload.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  gifload.c                                               *
 ***********************************************************/

diff --git a/src/gifload.h b/src/gifload.h
index 967221de659d11e0552ba5df1f8c3821ca9f159f..1551375a5ec4a26cfa1989708131191418af97ba 100644 (file)
--- a/src/gifload.h
+++ b/src/gifload.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  gifload.h                                               *
 ***********************************************************/

diff --git a/src/init.c b/src/init.c
index 4181eb00cb58737be9d121288400b7d6c5d4d0c3..27247acdb95fa296aba71e4163274e7de770ef31 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -1,17 +1,22 @@
 /***********************************************************
 *  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 <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
 #include "init.h"
 #include "misc.h"
 #include "sound.h"
@@ -22,8 +27,6 @@
 #include "gfxload.h"
 #include "gifload.h"
 
-#include <signal.h>
-
 #ifdef DEBUG
 /*
 #define DEBUG_TIMING
@@ -44,6 +47,7 @@ struct IconFileInfo
 
 static int sound_process_id = 0;
 
+static void InitServer(void);
 static void InitLevelAndPlayerInfo(void);
 static void InitDisplay(int, char **);
 static void InitSound(void);
@@ -55,6 +59,13 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
+
+
+  /* TEST TEST TEST */
+  InitServer();
+  /* TEST TEST TEST */
+
+
   InitLevelAndPlayerInfo();
 
   InitCounter();
@@ -78,6 +89,141 @@ void OpenAll(int argc, char *argv[])
   DrawMainMenu();
 }
 
+
+
+/* TEST STUFF -------------------------------------------------------------- */
+
+int norestart = 0;
+int nospeedup = 0;
+
+/* server stuff */
+
+#define DEFAULTPORT    19503
+#define BUFLEN         4096
+
+int sfd;
+unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN];
+unsigned char *buf = realbuf + 4;
+int nread = 0, nwrite = 0;
+
+void fatal(char *s)
+{
+  fprintf(stderr, "%s.\n", s);
+  exit(1);
+}
+
+void u_sleep(int i)
+{
+  struct timeval tm;
+  tm.tv_sec = i / 1000000;
+  tm.tv_usec = i % 1000000;
+  select(0, NULL, NULL, NULL, &tm);
+}
+
+void startserver()
+{
+  char *options[2];
+  int n = 0;
+
+  options[0] = options[1] = NULL;
+  if (norestart)
+    options[n++] = "-norestart";
+  if (nospeedup)
+    options[n++] = "-nospeedup";
+
+  switch (fork())
+  {
+    case 0:
+      execlp(
+#ifdef XTRISPATH
+      XTRISPATH "/rnd_server",
+#else
+      "rnd_server",
+#endif
+      "rnd_server", "-once", "-v", options[0], options[1], NULL);
+
+      fprintf(stderr, "Can't start server '%s'.\n",
+#ifdef XTRISPATH
+       XTRISPATH "/xtserv");
+#else
+       "xtserv");
+#endif
+
+      _exit(1);
+    
+    case -1:
+      fatal("fork() failed");
+    
+    default:
+      return;
+  }
+}
+
+void connect2server(char *host, int port)
+{
+  struct hostent *hp;
+  struct sockaddr_in s;
+  struct protoent *tcpproto;
+  int on = 1, i;
+
+  if (host)
+  {
+    if ((s.sin_addr.s_addr = inet_addr(host)) == -1)
+    {
+      hp = gethostbyname(host);
+      if (!hp)
+       fatal("Host not found");
+      s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]);
+    }
+  }
+  else
+    s.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+  s.sin_port = htons(port);
+  s.sin_family = AF_INET;
+  sfd = socket(PF_INET, SOCK_STREAM, 0);
+  if (sfd < 0)
+    fatal("Out of file descriptors");
+  if ((tcpproto = getprotobyname("tcp")) != NULL)
+    setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+
+  if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) < 0)
+  {
+    if (!host)
+    {
+      printf("No xtris server on localhost - starting up one ...\n");
+      startserver();
+      for (i=0; i<6; i++)
+      {
+       u_sleep(500000);
+       close(sfd);
+       sfd = socket(PF_INET, SOCK_STREAM, 0);
+       if (sfd < 0)
+         fatal("Out of file descriptors");
+       setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+       if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0)
+         break;
+      }
+      if (i==6)
+       fatal("Can't connect to server");
+    }
+    else
+      fatal("Can't connect to server");
+  }
+}
+
+void InitServer()
+{
+  if (server_port == 0)
+    server_port = DEFAULTPORT;
+
+  connect2server(server_host, server_port);
+}
+
+/* TEST STUFF -------------------------------------------------------------- */
+
+
+
 void InitLevelAndPlayerInfo()
 {
   local_player = &stored_player[0];

diff --git a/src/init.h b/src/init.h
index a4025311ecc17c865de5e134eb6c1d70556208b6..2c435418f5dec801aac77bdb8ae26224272cd58a 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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.h                                                  *
 ***********************************************************/

diff --git a/src/joystick.c b/src/joystick.c
index 7bf648ed75cd766059ff843b7a966659ac884c4c..0e1a42cd969b056933bd5589f6cc3e403fe4bc07 100644 (file)
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  joystick.c                                              *
 ***********************************************************/

diff --git a/src/joystick.h b/src/joystick.h
index 205f51f8ac6b37fb3e4dc8f830a10042723e2339..56c5b43d939379b456cae79449c59b01440fbebb 100644 (file)
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1997 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  joystick.h                                              *
 ***********************************************************/

diff --git a/src/main.c b/src/main.c
index 93cff5b00530a5a083775101b668ff9e1889c067..4b1a8c64ac0da60cc1283569cef6e4662568e15c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  main.c                                                  *
 ***********************************************************/
@@ -46,6 +45,9 @@ char         *joystick_device_name[2] = { DEV_JOYSTICK_0, DEV_JOYSTICK_1 };
 char          *level_directory = LEVEL_PATH;
 int            width, height;
 
+char          *server_host = NULL;
+int            server_port = 0;
+
 int            game_status = MAINMENU;
 int            game_emulation = EMU_NONE;
 int            button_status = MB_NOT_PRESSED, motion_status = FALSE;
@@ -193,8 +195,22 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
 
+
+
+  /*
   if (argc>1)
     level_directory = argv[1];
+    */
+
+
+
+  if (argc > 1)
+    server_host = argv[1];
+
+  if (argc > 2)
+    server_port = atoi(argv[2]);
+
+
 
 #ifdef MSDOS
   _fmode = O_BINARY;

diff --git a/src/main.h b/src/main.h
index 54efac83aa175866bed1e1db2b7ea93f0da1f1b5..d1abeccc52462bd684590a231af72f3dbd16531d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  main.h                                                  *
 ***********************************************************/
@@ -322,6 +321,9 @@ extern char        *joystick_device_name[2];
 extern char           *level_directory;
 extern int                     width, height;
 
+extern char           *server_host;
+extern int             server_port;
+
 extern int             game_status;
 extern int             game_emulation;
 extern int             button_status, motion_status;

diff --git a/src/misc.c b/src/misc.c
index 8a17d8c3a1437719ea803e932ad489f75a12c3e6..1ab116d6b771458990b295f4d676b32f36707142 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  misc.c                                                  *
 ***********************************************************/

diff --git a/src/misc.h b/src/misc.h
index a6a8fb01df4731a37860e954d2c36220f88e18c8..99c867a0a7f83b14da7384daf491ebc206bf33fc 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  misc.h                                                  *
 ***********************************************************/

diff --git a/src/msdos.c b/src/msdos.c
index bd4ad73db702344850def7f7231dd3e090ace0d9..54502aeff53a43c6ae791c82d84f9a6d55368f96 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  msdos.c                                                 *
 ***********************************************************/

diff --git a/src/msdos.h b/src/msdos.h
index c3357a65ca16c02a21f9d46621e22a4c247dcf20..b09c4ce48c6ae7547d493fc74e7193d81aa3284c 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  msdos.h                                                 *
 ***********************************************************/
@@ -469,4 +468,4 @@ extern KeySym XLookupKeysym(XKeyEvent*, int);
 //extern void XSetClipOrigin(Display*, GC, int, int);
 //extern XImage *XGetImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int);
 
-BITMAP *load_gif(char *filename, RGB *pal);
\ No newline at end of file
+BITMAP *load_gif(char *filename, RGB *pal);

diff --git a/src/random.h b/src/random.h
index 0f99fffdfaa2fe8cf0f491f7e896905dd4e237ca..366d1ff51db8476257b415c1b4c878ff93ce3dce 100644 (file)
--- a/src/random.h
+++ b/src/random.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  random.h                                                *
 ***********************************************************/

diff --git a/src/screens.c b/src/screens.c
index 5cc2e514e2e3b82ccf3c35344b4b159fb7a2f3b1..86a1235d1549547c18ff94da1a756e22e5dd7862 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  screens.c                                               *
 ***********************************************************/

diff --git a/src/screens.h b/src/screens.h
index abe2f198a127a1183858e88253963069aebc7be4..bde71a06a4cba21f33dedfbd5feef1027e3c5f3d 100644 (file)
--- a/src/screens.h
+++ b/src/screens.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  screens.h                                               *
 ***********************************************************/

diff --git a/src/sound.c b/src/sound.c
index 516892b5d1e8ff841bf8bf73372f98e7a8d50044..af9af974c33c8540c028cbfef04269f4c53946a4 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  sound.c                                                 *
 ***********************************************************/

diff --git a/src/sound.h b/src/sound.h
index 213cd746739b02abc5c368a338fac99f1aa5f43d..02431c4593d136232c0cd93a72ec05d7273f5458 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  sound.c                                                 *
 ***********************************************************/

diff --git a/src/tape.c b/src/tape.c
index 9c2668455a4092570a7bf53c1ab2c4fcfcc27e2d..53ce1d9ed3cee0a7f654f7b01486526006670071 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1997 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  tape.c                                                  *
 ***********************************************************/

diff --git a/src/tape.h b/src/tape.h
index ee0a98e34866a64180b5eb25fd5307a032ca34b0..aa1b58263240562bcfdf58bafb64d6b05c578c2f 100644 (file)
--- a/src/tape.h
+++ b/src/tape.h
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1997 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  tape.c                                                  *
 ***********************************************************/

diff --git a/src/tools.c b/src/tools.c
index 41e1b455b299c37beda0b38d7bb8268336098c7a..2aad13a9ade064e7ad2d2c73b9719f262b78f059 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  tools.c                                                 *
 ***********************************************************/

diff --git a/src/tools.h b/src/tools.h
index 557598227d019621d16573a89f0a2a65673823fd..c8436d111a990f3806c41c1054d266f5cbd1285a 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  tools.h                                                 *
 ***********************************************************/