X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=c7589cf005057b7a46c2fd1ec22ad7ba36d59a08;hp=6463df1b976f65ad72cec76db6253daf99917944;hb=39ad80f8d48b103622e36e40c951a66579444767;hpb=f360f1c76a4160a3da1e2863d22d670d3f44e900

diff --git a/src/game.c b/src/game.c
index 6463df1b..c7589cf0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3365,7 +3365,8 @@ void InitGame(void)
 
   ExpireSoundLoops(TRUE);
 
-  FadeOut(fade_mask);
+  if (!level_editor_test_game)
+    FadeOut(fade_mask);
 
   // needed if different viewport properties defined for playing
   ChangeViewportPropertiesIfNeeded();
@@ -3401,6 +3402,7 @@ void InitGame(void)
     player->action = 0;
     player->effective_action = 0;
     player->programmed_action = 0;
+    player->snap_action = 0;
 
     player->mouse_action.lx = 0;
     player->mouse_action.ly = 0;
@@ -3737,6 +3739,19 @@ void InitGame(void)
       game.belt_dir_nr[i] = 3;		// not moving, next moving left
 
 #if USE_NEW_PLAYER_ASSIGNMENTS
+  // use preferred player also in local single-player mode
+  if (!network.enabled && !game.team_mode)
+  {
+    int old_index_nr = local_player->index_nr;
+    int new_index_nr = setup.network_player_nr;
+
+    if (new_index_nr >= 0 && new_index_nr < MAX_PLAYERS)
+    {
+      stored_player[old_index_nr].connected_locally = FALSE;
+      stored_player[new_index_nr].connected_locally = TRUE;
+    }
+  }
+
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     stored_player[i].connected = FALSE;
@@ -5258,11 +5273,8 @@ static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
 
   while (scroll_x != new_scroll_x || scroll_y != new_scroll_y)
   {
-    int dx = 0, dy = 0;
-    int fx = FX, fy = FY;
-
-    dx = (new_scroll_x < scroll_x ? +1 : new_scroll_x > scroll_x ? -1 : 0);
-    dy = (new_scroll_y < scroll_y ? +1 : new_scroll_y > scroll_y ? -1 : 0);
+    int dx = (new_scroll_x < scroll_x ? +1 : new_scroll_x > scroll_x ? -1 : 0);
+    int dy = (new_scroll_y < scroll_y ? +1 : new_scroll_y > scroll_y ? -1 : 0);
 
     if (dx == 0 && dy == 0)		// no scrolling needed at all
       break;
@@ -5270,14 +5282,19 @@ static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
     scroll_x -= dx;
     scroll_y -= dy;
 
-    fx += dx * TILEX / 2;
-    fy += dy * TILEY / 2;
+    // set values for horizontal/vertical screen scrolling (half tile size)
+    int dir_x = (dx != 0 ? MV_HORIZONTAL : 0);
+    int dir_y = (dy != 0 ? MV_VERTICAL   : 0);
+    int pos_x = dx * TILEX / 2;
+    int pos_y = dy * TILEY / 2;
+    int fx = getFieldbufferOffsetX_RND(dir_x, pos_x);
+    int fy = getFieldbufferOffsetY_RND(dir_y, pos_y);
 
     ScrollLevel(dx, dy);
     DrawAllPlayers();
 
     // scroll in two steps of half tile size to make things smoother
-    BlitBitmap(drawto_field, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
+    BlitScreenToBitmapExt_RND(window, fx, fy);
 
     // scroll second step to align at full tile size
     BlitScreenToBitmap(window);
@@ -11044,10 +11061,7 @@ static void CheckSingleStepMode(struct PlayerInfo *player)
     if (!player->is_moving &&
 	!player->is_pushing &&
 	!player->is_dropping_pressed)
-    {
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
-      SnapField(player, 0, 0);			// stop snapping
-    }
   }
 
   CheckSaveEngineSnapshot(player);
@@ -11451,13 +11465,14 @@ static void GameActionsExt(void)
     stored_player[map_player_action[local_player->index_nr]].effective_action =
       summarized_player_action;
 
+  // summarize all actions at centered player in local team mode
   if (tape.recording &&
-      setup.team_mode &&
+      setup.team_mode && !network.enabled &&
       setup.input_on_focus &&
       game.centered_player_nr != -1)
   {
     for (i = 0; i < MAX_PLAYERS; i++)
-      stored_player[i].effective_action =
+      stored_player[map_player_action[i]].effective_action =
 	(i == game.centered_player_nr ? summarized_player_action : 0);
   }
 
@@ -11982,7 +11997,8 @@ void GameActions_RND(void)
 	   element == EL_DC_MAGIC_WALL_FULL ||
 	   element == EL_DC_MAGIC_WALL_ACTIVE ||
 	   element == EL_DC_MAGIC_WALL_EMPTYING) &&
-	  ABS(x-jx) + ABS(y-jy) < ABS(magic_wall_x-jx) + ABS(magic_wall_y-jy))
+	  ABS(x - jx) + ABS(y - jy) <
+	  ABS(magic_wall_x - jx) + ABS(magic_wall_y - jy))
       {
 	magic_wall_x = x;
 	magic_wall_y = y;
@@ -12164,12 +12180,17 @@ void GameActions_RND(void)
   DrawAllPlayers();
   PlayAllPlayersSound();
 
-  if (local_player->show_envelope != 0 && (!local_player->active ||
-					   local_player->MovPos == 0))
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1);
+    struct PlayerInfo *player = &stored_player[i];
+
+    if (player->show_envelope != 0 && (!player->active ||
+				       player->MovPos == 0))
+    {
+      ShowEnvelope(player->show_envelope - EL_ENVELOPE_1);
 
-    local_player->show_envelope = 0;
+      player->show_envelope = 0;
+    }
   }
 
   // use random number generator in every frame to make it less predictable
@@ -12500,7 +12521,6 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
        game.centered_player_nr == -1))
   {
     int old_scroll_x = scroll_x, old_scroll_y = scroll_y;
-    int offset = game.scroll_delay_value;
 
     if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy)))
     {
@@ -12512,15 +12532,19 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
     }
     else
     {
+      int offset = game.scroll_delay_value;
+
       if (jx != old_jx)		// player has moved horizontally
       {
- 	if ((player->MovDir == MV_LEFT  && scroll_x > jx - MIDPOSX + offset) ||
-	    (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset))
-	  scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
+	int offset_x = offset * (player->MovDir == MV_LEFT ? +1 : -1);
+	int new_scroll_x = jx - MIDPOSX + offset_x;
+
+	if ((player->MovDir == MV_LEFT  && scroll_x > new_scroll_x) ||
+	    (player->MovDir == MV_RIGHT && scroll_x < new_scroll_x))
+	  scroll_x = new_scroll_x;
 
 	// don't scroll over playfield boundaries
-	if (scroll_x < SBX_Left || scroll_x > SBX_Right)
-	  scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right);
+	scroll_x = MIN(MAX(SBX_Left, scroll_x), SBX_Right);
 
 	// don't scroll more than one field at a time
 	scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
@@ -12532,13 +12556,15 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
       }
       else			// player has moved vertically
       {
-	if ((player->MovDir == MV_UP   && scroll_y > jy - MIDPOSY + offset) ||
-	    (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset))
-	  scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
+	int offset_y = offset * (player->MovDir == MV_UP ? +1 : -1);
+	int new_scroll_y = jy - MIDPOSY + offset_y;
+
+	if ((player->MovDir == MV_UP   && scroll_y > new_scroll_y) ||
+	    (player->MovDir == MV_DOWN && scroll_y < new_scroll_y))
+	  scroll_y = new_scroll_y;
 
 	// don't scroll over playfield boundaries
-	if (scroll_y < SBY_Upper || scroll_y > SBY_Lower)
-	  scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower);
+	scroll_y = MIN(MAX(SBY_Upper, scroll_y), SBY_Lower);
 
 	// don't scroll more than one field at a time
 	scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);