X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=017adc470abf7a353bd45c16c5738af65bff89cc;hb=ab0879a8bcb3e816912bc89b8e21c22cc2a4c0c2;hp=c19a74da3a3a696727ecf48a25697668f828edc1;hpb=ef86a9fafe44eeffdda3a301ca4a2f586602f481;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index c19a74da..017adc47 100644
--- a/src/game.c
+++ b/src/game.c
@@ -289,10 +289,26 @@ void InitGame()
 
   /* when in single player mode, eliminate all but the first active player */
   if (!options.network && !setup.team_mode)
+  {
     for(i=0; i<MAX_PLAYERS; i++)
+    {
       if (stored_player[i].active)
+      {
 	for(j=i+1; j<MAX_PLAYERS; j++)
-	  stored_player[j].active = FALSE;
+	{
+	  struct PlayerInfo *player = &stored_player[j];
+	  int jx = player->jx, jy = player->jy;
+
+	  if (player->active)
+	  {
+	    player->active = FALSE;
+	    StorePlayer[jx][jy] = 0;
+	    Feld[jx][jy] = EL_LEERRAUM;
+	  }
+	}
+      }
+    }
+  }
 
   for(i=0; i<MAX_PLAYERS; i++)
   {
@@ -528,7 +544,7 @@ void GameWon()
   if (tape.recording)
   {
     TapeStop();
-    SaveLevelTape(tape.level_nr);	/* Ask to save tape */
+    SaveTape(tape.level_nr);		/* Ask to save tape */
   }
 
   if ((hi_pos=NewHiScore()) >= 0) 
@@ -2921,7 +2937,7 @@ void GameActions()
   int sieb_x = 0, sieb_y = 0;
   int i, x,y, element;
   byte *recorded_player_action;
-  byte summarized_player_action;
+  byte summarized_player_action = 0;
 
   if (game_status != PLAYING)
     return;
@@ -3357,8 +3373,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 	  scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
 
 	/* don't scroll over playfield boundaries */
-	if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 2)
-	  scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 2);
+	if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 1)
+	  scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 1);
 
 	/* don't scroll more than one field at a time */
 	scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
@@ -3375,8 +3391,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 	  scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
 
 	/* don't scroll over playfield boundaries */
-	if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 2)
-	  scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 2);
+	if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 1)
+	  scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 1);
 
 	/* don't scroll more than one field at a time */
 	scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);