projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060816-1-src
[rocksndiamonds.git]
/
src
/
tape.c
diff --git
a/src/tape.c
b/src/tape.c
index becd0ad9affd199b714e7c3c663ede2383c65331..9387b3a51b473f8b9eace6a001f32cd0fb46b034 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-542,14
+542,14
@@
static void TapeStartGameRecording()
#if defined(NETWORK_AVALIABLE)
if (options.network)
#if defined(NETWORK_AVALIABLE)
if (options.network)
- SendToServer_StartPlaying();
- else
-#endif
{
{
-
game_status = GAME_MODE_PLAYING
;
- StopAnimation();
-
InitGame()
;
+
SendToServer_StartPlaying()
;
+
+
return
;
}
}
+#endif
+
+ InitGame();
}
static void TapeAppendRecording()
}
static void TapeAppendRecording()
@@
-613,7
+613,7
@@
void TapeRecordAction(byte action_raw[MAX_PLAYERS])
for (i = 0; i < MAX_PLAYERS; i++)
if (tape.centered_player_nr_next == i ||
tape.centered_player_nr_next == -1)
for (i = 0; i < MAX_PLAYERS; i++)
if (tape.centered_player_nr_next == i ||
tape.centered_player_nr_next == -1)
- action[i] |= SET_FOCUS;
+ action[i] |=
KEY_
SET_FOCUS;
tape.set_centered_player = FALSE;
}
tape.set_centered_player = FALSE;
}
@@
-706,8
+706,6
@@
static void TapeStartGamePlaying()
{
TapeStartPlaying();
{
TapeStartPlaying();
- game_status = GAME_MODE_PLAYING;
- StopAnimation();
InitGame();
}
InitGame();
}
@@
-803,14
+801,14
@@
byte *TapePlayAction()
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
- if (action[i] & SET_FOCUS)
+ if (action[i] &
KEY_
SET_FOCUS)
{
tape.set_centered_player = TRUE;
tape.centered_player_nr_next =
(tape.centered_player_nr_next == -999 ? i : -1);
}
{
tape.set_centered_player = TRUE;
tape.centered_player_nr_next =
(tape.centered_player_nr_next == -999 ? i : -1);
}
- action[i] &= ~SET_FOCUS;
+ action[i] &= ~
KEY_
SET_FOCUS;
}
tape.delay_played++;
}
tape.delay_played++;