From: Holger Schemel <info@artsoft.org>
Date: Tue, 13 Oct 1998 22:39:33 +0000 (+0200)
Subject: rnd-19981013-3
X-Git-Tag: 1.2.0^2~58
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=3836649c663e70e503686c52c67f71d21c00bb84;p=rocksndiamonds.git

rnd-19981013-3
---

diff --git a/src/game.c b/src/game.c
index 354c823b..9c152d05 100644
--- a/src/game.c
+++ b/src/game.c
@@ -63,6 +63,9 @@ void InitGame()
   BOOL emulate_bd = TRUE;	/* unless non-BOULDERDASH elements found */
   BOOL emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
 
+  /* don't play tapes over network */
+  network_playing = (network && !tape.playing);
+
   for(i=0; i<MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
@@ -134,7 +137,7 @@ void InitGame()
 
 
   /* initial null action */
-  if (network)
+  if (network_playing)
     SendToServer_MovePlayer(MV_NO_MOVING);
 
 
@@ -2889,7 +2892,7 @@ void GameActions(byte player_action)
   /* main game synchronization point */
   WaitUntilDelayReached(&action_delay, action_delay_value);
 
-  if (network && !network_player_action_received)
+  if (network_playing && !network_player_action_received)
   {
     /*
 #ifdef DEBUG
@@ -2926,13 +2929,18 @@ void GameActions(byte player_action)
   else
     recorded_player_action = NULL;
 
-  if (network)
+  if (network_playing)
     SendToServer_MovePlayer(player_action);
 
   for(i=0; i<MAX_PLAYERS; i++)
   {
+    /*
     int actual_player_action =
       (network ? network_player_action[i] : player_action);
+      */
+
+    int actual_player_action =
+      (network_playing ? network_player_action[i] : player_action);
 
     /*
     int actual_player_action = network_player_action[i];
diff --git a/src/main.c b/src/main.c
index 4db66463..49478464 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,7 @@ int		verbose = FALSE;
 
 int		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
+int		network_playing = FALSE;
 int		button_status = MB_NOT_PRESSED, motion_status = FALSE;
 int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
diff --git a/src/main.h b/src/main.h
index 794256e2..ce5d1bb9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -329,6 +329,7 @@ extern int		verbose;
 
 extern int		game_status;
 extern int		game_emulation;
+extern int		network_playing;
 extern int		button_status, motion_status;
 extern int		key_joystick_mapping;
 extern int	    	global_joystick_status, joystick_status;
diff --git a/src/netserv.c b/src/netserv.c
index 221c8ff9..b9dad162 100644
--- a/src/netserv.c
+++ b/src/netserv.c
@@ -41,7 +41,7 @@ static int clients = 0;
 static int bots = 0;
 static int onceonly = 0;
 static int timetoplay = 0;
-static int daemon = 0;
+static int is_daemon = 0;
 static int level = 5;
 static int mode = -1;
 static int paused = 0;
@@ -83,7 +83,7 @@ static fd_set fds;
 
 static void syserr(char *s)
 {
-  if (!daemon)
+  if (!is_daemon)
     fprintf(stderr, "fatal: %s failed.\n", s);
   exit(1);
 }
@@ -518,7 +518,7 @@ void NetworkServer(int port, int serveronly)
   unsigned int len;
   struct protoent *tcpproto;
   struct timeval tv;
-  int daemon = 0;
+  int is_daemon = 0;
 
 #ifndef NeXT
   struct sigaction sact;
@@ -558,7 +558,7 @@ void NetworkServer(int port, int serveronly)
 
   listen(lfd, 5);
 
-  if (daemon)
+  if (is_daemon)
   {
     /* become a daemon, breaking all ties with the controlling terminal */
     verbose = 0;
diff --git a/src/network.c b/src/network.c
index d92a0909..82f406d6 100644
--- a/src/network.c
+++ b/src/network.c
@@ -516,6 +516,9 @@ static void Handle_OP_MOVE_FIGURE()
   int frame_nr;
   int i;
 
+  if (!network_playing)
+    return;
+
   frame_nr =
     (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);