game.envelope_active = FALSE;
- game.centered_to_player = game.centered_to_player_next = 0; /* player_1 */
+ game.centered_player_nr = game.centered_player_nr_next = -1; /* focus all */
for (i = 0; i < NUM_BELTS; i++)
{
InitField(jx, jy, FALSE);
}
+#if 1
+ /* only visually relocate centered player */
+ if (player->index_nr == game.centered_player_nr)
+ DrawRelocatePlayer(player, level.instant_relocation);
+#else
if (player == local_player) /* only visually relocate local player */
DrawRelocatePlayer(player, level.instant_relocation);
+#endif
TestIfPlayerTouchesBadThing(jx, jy);
TestIfPlayerTouchesCustomElement(jx, jy);
if (ScreenMovPos == 0) /* screen currently aligned at tile position */
{
- struct PlayerInfo *player = &stored_player[game.centered_to_player_next];
+ struct PlayerInfo *player;
+ int player_nr = game.centered_player_nr_next;
+
+ if (game.centered_player_nr_next == -1)
+ player_nr = local_player->index_nr;
+
+ player = &stored_player[player_nr];
if (!player->active)
- game.centered_to_player_next = game.centered_to_player;
+ game.centered_player_nr_next = game.centered_player_nr;
- if (game.centered_to_player != game.centered_to_player_next)
+ if (game.centered_player_nr != game.centered_player_nr_next)
{
DrawRelocatePlayer(player, setup.quick_switch);
- game.centered_to_player = game.centered_to_player_next;
+ game.centered_player_nr = game.centered_player_nr_next;
}
}
#endif
}
-#if 0
+#if 1
+ if (!options.network && game.centered_player_nr == -1 &&
+ !AllPlayersInSight(player, new_jx, new_jy))
+ return MP_NO_ACTION;
+#else
if (!options.network && !AllPlayersInSight(player, new_jx, new_jy))
return MP_NO_ACTION;
#endif
#if 1
if (moved & MP_MOVING && !ScreenMovPos &&
- player->index_nr == game.centered_to_player)
+ (player->index_nr == game.centered_player_nr ||
+ game.centered_player_nr == -1))
#else
if (moved & MP_MOVING && !ScreenMovPos &&
(player == local_player || !options.network))
if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
{
-#if 0
+#if 1
+ if (!options.network && game.centered_player_nr == -1 &&
+ !AllPlayersInVisibleScreen())
+ {
+ scroll_x = old_scroll_x;
+ scroll_y = old_scroll_y;
+ }
+ else
+#else
if (!options.network && !AllPlayersInVisibleScreen())
{
scroll_x = old_scroll_x;