projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a527213
)
added missing recording modes to tape recorder display state function
author
Holger Schemel
<info@artsoft.org>
Tue, 7 Jun 2016 12:30:06 +0000
(14:30 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 7 Jun 2016 12:30:06 +0000
(14:30 +0200)
src/tape.c
patch
|
blob
|
history
diff --git
a/src/tape.c
b/src/tape.c
index 963ca1e89a6253b7a8f6d25fc9c264612395554c..919bd418455f9749b5490bf4445de947b3371a05 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-356,20
+356,26
@@
void DrawVideoDisplaySymbol(unsigned int state)
DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
}
DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
}
-void DrawVideoDisplay
Play
State()
+void DrawVideoDisplay
Current
State()
{
int state = 0;
DrawVideoDisplay(VIDEO_STATE_OFF, 0);
{
int state = 0;
DrawVideoDisplay(VIDEO_STATE_OFF, 0);
- state |= VIDEO_STATE_PLAY_ON;
-
if (tape.pausing)
if (tape.pausing)
- {
state |= VIDEO_STATE_PAUSE_ON;
state |= VIDEO_STATE_PAUSE_ON;
+
+ if (tape.recording)
+ {
+ state |= VIDEO_STATE_REC_ON;
+
+ if (tape.single_step)
+ state |= VIDEO_STATE_1STEP_ON;
}
}
- else
+ else
if (tape.playing)
{
{
+ state |= VIDEO_STATE_PLAY_ON;
+
if (tape.deactivate_display)
state |= VIDEO_STATE_WARP2_ON;
else if (tape.warp_forward)
if (tape.deactivate_display)
state |= VIDEO_STATE_WARP2_ON;
else if (tape.warp_forward)
@@
-673,7
+679,7
@@
void TapeTogglePause(boolean toggle_manual)
if (tape.single_step && toggle_manual)
tape.single_step = FALSE;
if (tape.single_step && toggle_manual)
tape.single_step = FALSE;
- DrawVideoDisplay
Play
State();
+ DrawVideoDisplay
Current
State();
if (tape.deactivate_display)
{
if (tape.deactivate_display)
{
@@
-883,7
+889,7
@@
static void TapeStartWarpForward()
TapeDeactivateDisplayOn();
TapeDeactivateDisplayOn();
- DrawVideoDisplay
Play
State();
+ DrawVideoDisplay
Current
State();
}
static void TapeStopWarpForward()
}
static void TapeStopWarpForward()
@@
-896,7
+902,7
@@
static void TapeStopWarpForward()
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
- DrawVideoDisplay
Play
State();
+ DrawVideoDisplay
Current
State();
}
static void TapeSingleStep()
}
static void TapeSingleStep()
@@
-1308,7
+1314,7
@@
static void HandleTapeButtonsExt(int id)
{
tape.pause_before_end = !tape.pause_before_end;
{
tape.pause_before_end = !tape.pause_before_end;
- DrawVideoDisplay
Play
State();
+ DrawVideoDisplay
Current
State();
}
else if (tape.recording)
{
}
else if (tape.recording)
{
@@
-1393,7
+1399,7
@@
static void HandleTapeButtonsExt(int id)
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
}
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
}
- DrawVideoDisplay
Play
State();
+ DrawVideoDisplay
Current
State();
}
break;
}
break;