From: Holger Schemel <info@artsoft.org>
Date: Mon, 26 Oct 1998 00:39:37 +0000 (+0100)
Subject: rnd-19981026-3
X-Git-Tag: 1.2.0^2~42
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=0a52f54d2f6ab7dce8062c7738ede185ba5acad3

rnd-19981026-3
---

diff --git a/src/events.c b/src/events.c
index 5fd56c0b..f360abd6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -409,14 +409,14 @@ void HandleKey(KeySym key, int key_status)
       if (key_status == KEY_PRESSED)
       {
 	if (network_playing)
-	  local_player->action |= key_action;
+	  local_player->potential_action |= key_action;
 	else
 	  stored_player[pnr].action |= key_action;
       }
       else
       {
 	if (network_playing)
-	  local_player->action &= ~key_action;
+	  local_player->potential_action &= ~key_action;
 	else
 	  stored_player[pnr].action &= ~key_action;
       }
@@ -935,16 +935,6 @@ void HandleJoystick()
 	return;
       }
 
-      /*
-      if (tape.pausing || AllPlayersGone)
-      {
-	int i;
-
-	for (i=0; i<MAX_PLAYERS; i++)
-	  stored_player[i].action = 0;
-      }
-      */
-
       HandleGameActions();
       break;
 
diff --git a/src/game.c b/src/game.c
index d780d352..17cfd897 100644
--- a/src/game.c
+++ b/src/game.c
@@ -68,6 +68,7 @@ void InitGame()
     player->active = FALSE;
 
     player->action = 0;
+    player->potential_action = 0;
 
     player->score = 0;
     player->gems_still_needed = level.edelsteine;
@@ -2949,7 +2950,7 @@ void GameActions()
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
   if (network_playing)
-    SendToServer_MovePlayer(local_player->action);
+    SendToServer_MovePlayer(local_player->potential_action);
 
   for(i=0; i<MAX_PLAYERS; i++)
   {
diff --git a/src/main.h b/src/main.h
index 81a67831..a4ea0476 100644
--- a/src/main.h
+++ b/src/main.h
@@ -271,7 +271,8 @@ struct PlayerInfo
 
   int index_nr, client_nr, element_nr;
 
-  byte action;
+  byte action;			/* action from server or for local playing */
+  byte potential_action;	/* must go to network server first */
 
   char login_name[MAX_NAMELEN];
   char alias_name[MAX_NAMELEN];