projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5eabbc4
)
renamed variable
author
Holger Schemel
<info@artsoft.org>
Thu, 2 Jun 2016 05:05:21 +0000
(07:05 +0200)
committer
Holger Schemel
<info@artsoft.org>
Thu, 2 Jun 2016 05:05:21 +0000
(07:05 +0200)
src/tape.c
patch
|
blob
|
history
src/tape.h
patch
|
blob
|
history
diff --git
a/src/tape.c
b/src/tape.c
index c0dde51942e8b862dcc1aad7456cbdb5efcb599f..cd9fa88bd6540888e7f03772da54192b3cfac54f 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-560,7
+560,7
@@
static void TapeRewind()
{
tape.counter = 0;
tape.delay_played = 0;
{
tape.counter = 0;
tape.delay_played = 0;
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
tape.recording = FALSE;
tape.playing = FALSE;
tape.fast_forward = FALSE;
tape.recording = FALSE;
tape.playing = FALSE;
tape.fast_forward = FALSE;
@@
-629,7
+629,7
@@
static void TapeAppendRecording()
tape.playing = FALSE;
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
tape.playing = FALSE;
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
tape.deactivate_display = FALSE;
// start recording
tape.deactivate_display = FALSE;
// start recording
@@
-736,7
+736,7
@@
void TapeTogglePause(boolean toggle_manual)
state |= VIDEO_STATE_PAUSE(tape.pausing);
state |= VIDEO_STATE_PAUSE(tape.pausing);
- if (tape.pause_before_
death
)
+ if (tape.pause_before_
end
)
state |= VIDEO_STATE_PBEND(!tape.pausing);
else if (tape.fast_forward)
state |= VIDEO_STATE_FFWD(!tape.pausing);
state |= VIDEO_STATE_PBEND(!tape.pausing);
else if (tape.fast_forward)
state |= VIDEO_STATE_FFWD(!tape.pausing);
@@
-844,12
+844,12
@@
byte *TapePlayAction()
if (!tape.playing || tape.pausing)
return NULL;
if (!tape.playing || tape.pausing)
return NULL;
- if (tape.pause_before_
death
) // stop some seconds before end of tape
+ if (tape.pause_before_
end
) // stop some seconds before end of tape
{
if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
{
tape.fast_forward = FALSE;
{
if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
{
tape.fast_forward = FALSE;
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@
-860,7
+860,7
@@
byte *TapePlayAction()
if (update_video_display && !tape.deactivate_display)
{
if (update_video_display && !tape.deactivate_display)
{
- if (tape.pause_before_
death
)
+ if (tape.pause_before_
end
)
DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
else if (tape.fast_forward)
DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
else if (tape.fast_forward)
DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
@@
-952,10
+952,10
@@
static void TapeStartWarpForward()
{
tape.warp_forward = TRUE;
{
tape.warp_forward = TRUE;
- if (!tape.fast_forward && !tape.pause_before_
death
)
+ if (!tape.fast_forward && !tape.pause_before_
end
)
{
tape.pausing = FALSE;
{
tape.pausing = FALSE;
- tape.pause_before_
death
= TRUE;
+ tape.pause_before_
end
= TRUE;
tape.deactivate_display = TRUE;
TapeDeactivateDisplayOn();
tape.deactivate_display = TRUE;
TapeDeactivateDisplayOn();
@@
-974,7
+974,7
@@
static void TapeStopWarpForward()
int state = VIDEO_STATE_PAUSE(tape.pausing);
if (tape.deactivate_display)
int state = VIDEO_STATE_PAUSE(tape.pausing);
if (tape.deactivate_display)
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
tape.warp_forward = FALSE;
tape.deactivate_display = FALSE;
tape.warp_forward = FALSE;
tape.deactivate_display = FALSE;
@@
-982,8
+982,8
@@
static void TapeStopWarpForward()
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
state |= VIDEO_STATE_WARP_OFF;
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
state |= VIDEO_STATE_WARP_OFF;
- state |= (tape.pause_before_
death
? VIDEO_STATE_PBEND_ON :
- tape.fast_forward
? VIDEO_STATE_FFWD_ON :
+ state |= (tape.pause_before_
end
? VIDEO_STATE_PBEND_ON :
+ tape.fast_forward ? VIDEO_STATE_FFWD_ON :
VIDEO_STATE_PLAY_ON);
DrawVideoDisplay(state, 0);
VIDEO_STATE_PLAY_ON);
DrawVideoDisplay(state, 0);
@@
-1456,7
+1456,7
@@
static void HandleTapeButtonsExt(int id)
// continue playing in normal mode
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
// continue playing in normal mode
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
tape.deactivate_display = FALSE;
TapeTogglePause(TAPE_TOGGLE_MANUAL);
tape.deactivate_display = FALSE;
TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@
-1472,9
+1472,9
@@
static void HandleTapeButtonsExt(int id)
DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
}
DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
}
- else if (!tape.pause_before_
death)
/* FFWD PLAY -> AUTO PAUSE */
+ else if (!tape.pause_before_
end)
/* FFWD PLAY -> AUTO PAUSE */
{
{
- tape.pause_before_
death
= TRUE;
+ tape.pause_before_
end
= TRUE;
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
@@
-1487,7
+1487,7
@@
static void HandleTapeButtonsExt(int id)
TapeStopWarpForward();
tape.fast_forward = FALSE;
TapeStopWarpForward();
tape.fast_forward = FALSE;
- tape.pause_before_
death
= FALSE;
+ tape.pause_before_
end
= FALSE;
DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
}
DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
}
diff --git
a/src/tape.h
b/src/tape.h
index 4eea1de0bfad091d9705878be0fa123e4500c5fd..2eb089e51322aab10be60c5e598fd3b239c78a5a 100644
(file)
--- a/
src/tape.h
+++ b/
src/tape.h
@@
-164,7
+164,7
@@
struct TapeInfo
unsigned int length_frames;
unsigned int length_seconds;
unsigned int delay_played;
unsigned int length_frames;
unsigned int length_seconds;
unsigned int delay_played;
- boolean pause_before_
death
;
+ boolean pause_before_
end
;
boolean recording, playing, pausing;
boolean fast_forward;
boolean warp_forward;
boolean recording, playing, pausing;
boolean fast_forward;
boolean warp_forward;