From: Holger Schemel <info@artsoft.org>
Date: Mon, 28 Sep 1998 14:51:45 +0000 (+0200)
Subject: rnd-19980928-3
X-Git-Tag: 1.2.0^2~74
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=2f78218c8acbfb82cafa38a46656cd083b7c73e1;p=rocksndiamonds.git

rnd-19980928-3
---

diff --git a/src/events.c b/src/events.c
index 48638bde..771efb28 100644
--- a/src/events.c
+++ b/src/events.c
@@ -673,7 +673,9 @@ void HandleKey(KeySym key, int key_status)
 	  {
 	    char *color[] = { "yellow", "red", "green", "blue" };
 
-	    TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    do
+	      TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    while(!stored_player[TestPlayer].active);
 
 	    printf("TestPlayer = %d (%s player)\n",
 		   TestPlayer, color[TestPlayer]);
diff --git a/src/game.c b/src/game.c
index b7856164..8e6c8a9c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -114,7 +114,11 @@ void InitGame()
 
 
     /* TEST TEST TEST */
+
+    /*
     stored_player[i].active = TRUE;
+    */
+
     /* TEST TEST TEST */
 
     player->LevelSolved = FALSE;
@@ -171,6 +175,8 @@ void InitGame()
 	if (StorePlayer[jx][jy] == Feld[x][y])
 	  StorePlayer[jx][jy] = 0;
 
+	player->active = TRUE;
+
 	StorePlayer[x][y] = Feld[x][y];
 	Feld[x][y] = EL_LEERRAUM;
 	player->jx = player->last_jx = x;
@@ -2798,7 +2804,7 @@ void GameActions(int player_action)
   {
     /* TEST TEST TEST */
 
-    if (i != TestPlayer)
+    if (i != TestPlayer && !stored_player[i].MovPos)
       continue;
 
     /* TEST TEST TEST */