BOOL emulate_bd = TRUE; /* unless non-BOULDERDASH elements found */
BOOL emulate_sb = TRUE; /* unless non-SOKOBAN elements found */
+ /* don't play tapes over network */
+ network_playing = (network && !tape.playing);
+
for(i=0; i<MAX_PLAYERS; i++)
{
struct PlayerInfo *player = &stored_player[i];
network_player_action_received = FALSE;
-
-
/* initial null action */
- SendToServer_MovePlayer(MV_NO_MOVING);
-
-
-
- /*
- printf("BLURB\n");
- */
-
-
+ if (network_playing)
+ SendToServer_MovePlayer(MV_NO_MOVING);
ZX = ZY = -1;
/* main game synchronization point */
WaitUntilDelayReached(&action_delay, action_delay_value);
- if (!standalone && !network_player_action_received)
+ if (network_playing && !network_player_action_received)
{
/*
#ifdef DEBUG
}
}
+
+ if (tape.pausing || (tape.playing && !TapePlayDelay()))
+ return;
+ else if (tape.recording)
+ TapeRecordDelay();
+
+
if (tape.playing)
recorded_player_action = TapePlayAction();
else
recorded_player_action = NULL;
- if (!standalone)
+ if (network_playing)
SendToServer_MovePlayer(player_action);
for(i=0; i<MAX_PLAYERS; i++)
{
+ /*
int actual_player_action =
- (standalone ? player_action : network_player_action[i]);
+ (network ? network_player_action[i] : player_action);
+ */
+
+ int actual_player_action =
+ (network_playing ? network_player_action[i] : player_action);
/*
int actual_player_action = network_player_action[i];
actual_player_action = 0;
*/
- if (standalone && i != TestPlayer)
+ if (!network && i != TestPlayer)
actual_player_action = 0;
/* TEST TEST TEST */
ScrollScreen(NULL, SCROLL_GO_ON);
+ /*
if (tape.pausing || (tape.playing && !TapePlayDelay()))
return;
else if (tape.recording)
TapeRecordDelay();
+ */
FrameCounter++;
TimeFrames++;
if (!IN_LEV_FIELD(new_jx,new_jy))
return(MF_NO_ACTION);
- if (standalone && !AllPlayersInSight(player, new_jx,new_jy))
+ if (!network && !AllPlayersInSight(player, new_jx,new_jy))
return(MF_NO_ACTION);
element = MovingOrBlocked2Element(new_jx,new_jy);
*/
if (moved & MF_MOVING && !ScreenMovPos &&
- (player == local_player || standalone))
+ (player == local_player || !network))
{
int old_scroll_x = scroll_x, old_scroll_y = scroll_y;
int offset = (scroll_delay_on ? 3 : 0);
if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
{
- if (standalone && !AllPlayersInVisibleScreen())
+ if (!network && !AllPlayersInVisibleScreen())
{
scroll_x = old_scroll_x;
scroll_y = old_scroll_y;