X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=2aeb77090462363b445a311d19f3c2edf49f10a2;hb=b2a0ff1ddd4430110b331129469dabb8ea7b6ba7;hp=a9fba3709e76aec839bd4bda48b0a9aa4a87bfab;hpb=7b31a77eec53ed2b96d5924a743b0706c9e4b11c;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index a9fba370..2aeb7709 100644
--- 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                                                  *
 ***********************************************************/
@@ -15,6 +14,13 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #ifndef MSDOS
 #define XK_MISCELLANY
 #define XK_LATIN1
@@ -33,13 +39,6 @@
 #include "msdos.h"
 #endif  /* #ifndef MSDOS */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
 typedef int BOOL;
 
 #ifndef FALSE
@@ -288,7 +287,7 @@ struct RecordingInfo
   BOOL changed;
   struct
   {
-    unsigned char joystickdata;
+    unsigned char joystickdata[MAX_PLAYERS];
     unsigned char delay;
   } pos[MAX_TAPELEN];
 };
@@ -322,6 +321,11 @@ extern char	       *joystick_device_name[2];
 extern char	       *level_directory;
 extern int     		width, height;
 
+extern char	       *server_host;
+extern int		server_port;
+extern int		networking;
+extern int		standalone;
+
 extern int		game_status;
 extern int		game_emulation;
 extern int		button_status, motion_status;
@@ -339,7 +343,6 @@ extern int		fading_on;
 extern int		autorecord_on;
 extern int		joystick_nr;
 extern int		quick_doors;
-extern int		networking;
 
 extern BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
@@ -956,10 +959,10 @@ extern char		*progname;
 
 /* directions for moving */
 #define MV_NO_MOVING		0
-#define MV_LEFT			1
-#define MV_RIGHT		2
-#define MV_UP			4
-#define MV_DOWN	       		8
+#define MV_LEFT			(1<<0)
+#define MV_RIGHT		(1<<1)
+#define MV_UP			(1<<2)
+#define MV_DOWN	       		(1<<3)
 
 /* font types */
 #define FS_SMALL		0
@@ -1038,12 +1041,13 @@ extern char		*progname;
 
 /* old cookies */
 #define NAMES_COOKIE_10		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.0"
+#define LEVELREC_COOKIE_10	"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
 
 #define LEVEL_COOKIE		"ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0"
 #define SCORE_COOKIE		"ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.0"
 #define NAMES_COOKIE		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.1"
 #define LEVELDIR_COOKIE		"ROCKSNDIAMONDS_LEVELDIR_FILE_VERSION_1.0"
-#define LEVELREC_COOKIE		"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
+#define LEVELREC_COOKIE		"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.2"
 #define JOYSTICK_COOKIE		"ROCKSNDIAMONDS_JOYSTICK_FILE_VERSION_1.0"
 #define LEVEL_COOKIE_LEN	(strlen(LEVEL_COOKIE)+1)
 #define SCORE_COOKIE_LEN	(strlen(SCORE_COOKIE)+1)