X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=794256e271d76cc517f6aaac0f48553596bf436f;hb=59c2e609872b70cb4c458004cd9e2fe22c86a54b;hp=dc5da4ffe71166dc8ca237d9129581dd3328ad87;hpb=57562a0f29074feea1dc01ddf1b1d5e4e6d59730;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index dc5da4ff..794256e2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -144,12 +144,7 @@ typedef unsigned char byte;
 #define IS_PUSHABLE(e)		(Elementeigenschaften[e] & EP_BIT_PUSHABLE)
 #define ELEM_IS_PLAYER(e)	(Elementeigenschaften[e] & EP_BIT_PLAYER)
 
-/*
-#define IS_PLAYER(x,y)		(JX == (x) && JY == (y))
-*/
-
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
-#define IS_LOCAL_PLAYER(x,y)	(StorePlayer[x][y] == EL_SPIELER1)
 
 #define IS_FREE(x,y)		(Feld[x][y] == EL_LEERRAUM && !IS_PLAYER(x,y))
 #define IS_FREE_OR_PLAYER(x,y)	(Feld[x][y] == EL_LEERRAUM)
@@ -214,7 +209,8 @@ struct HiScore
 
 struct PlayerInfo
 {
-  int nr, active, local;
+  int active, local;
+  int index_nr, client_nr, element_nr;
 
   char login_name[MAX_NAMELEN];
   char alias_name[MAX_NAMELEN];
@@ -277,7 +273,7 @@ struct LevelDirInfo
 struct RecordingInfo
 {
   int level_nr;
-  unsigned int random_seed;
+  unsigned long random_seed;
   unsigned long date;
   unsigned long counter;
   unsigned long length;
@@ -289,7 +285,7 @@ struct RecordingInfo
   BOOL changed;
   struct
   {
-    byte joystickdata[MAX_PLAYERS];
+    byte action[MAX_PLAYERS];
     byte delay;
   } pos[MAX_TAPELEN];
 };
@@ -327,8 +323,8 @@ extern char	       *program_name;
 extern char	       *display_name;
 extern char	       *server_host;
 extern int		server_port;
-extern int		networking;
-extern int		standalone;
+extern int		serveronly;
+extern int		network;
 extern int		verbose;
 
 extern int		game_status;
@@ -381,6 +377,8 @@ extern int		AllPlayersGone;
 extern int		FrameCounter, TimeFrames, TimeLeft;
 extern int		MampferNr, SiebAktiv;
 
+extern byte		network_player_action[];
+extern BOOL		network_player_action_received;
 extern int		TestPlayer;
 
 extern struct LevelDirInfo	leveldir[];