projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added also fading in/out global animations to be started/stopped
[rocksndiamonds.git]
/
src
/
tape.h
diff --git
a/src/tape.h
b/src/tape.h
index 0e6d11d880404fb244a792bc8c1bd6a98c7153d5..e77cd86c99204380aac547261b82fd2fa2def85a 100644
(file)
--- a/
src/tape.h
+++ b/
src/tape.h
@@
-50,37
+50,40
@@
#define VIDEO_STATE_TIME_OFF (1 << 8)
#define VIDEO_STATE_TIME_ON (1 << 9)
#define VIDEO_STATE_TIME (VIDEO_STATE_TIME_OFF | VIDEO_STATE_TIME_ON)
#define VIDEO_STATE_TIME_OFF (1 << 8)
#define VIDEO_STATE_TIME_ON (1 << 9)
#define VIDEO_STATE_TIME (VIDEO_STATE_TIME_OFF | VIDEO_STATE_TIME_ON)
+#define VIDEO_STATE_FRAME_OFF (1 << 10)
+#define VIDEO_STATE_FRAME_ON (1 << 11)
+#define VIDEO_STATE_FRAME (VIDEO_STATE_FRAME_OFF | VIDEO_STATE_FRAME_ON)
-#define VIDEO_STATE_FFWD_OFF (1 << 1
0
)
-#define VIDEO_STATE_FFWD_ON (1 << 1
1
)
+#define VIDEO_STATE_FFWD_OFF (1 << 1
2
)
+#define VIDEO_STATE_FFWD_ON (1 << 1
3
)
#define VIDEO_STATE_FFWD (VIDEO_STATE_FFWD_OFF | VIDEO_STATE_FFWD_ON)
#define VIDEO_STATE_FFWD (VIDEO_STATE_FFWD_OFF | VIDEO_STATE_FFWD_ON)
-#define VIDEO_STATE_PBEND_OFF (1 << 1
2
)
-#define VIDEO_STATE_PBEND_ON (1 << 1
3
)
+#define VIDEO_STATE_PBEND_OFF (1 << 1
4
)
+#define VIDEO_STATE_PBEND_ON (1 << 1
5
)
#define VIDEO_STATE_PBEND (VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PBEND_ON)
#define VIDEO_STATE_PBEND (VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PBEND_ON)
-#define VIDEO_STATE_WARP_OFF (1 << 1
4
)
-#define VIDEO_STATE_WARP_ON (1 << 1
5
)
+#define VIDEO_STATE_WARP_OFF (1 << 1
6
)
+#define VIDEO_STATE_WARP_ON (1 << 1
7
)
#define VIDEO_STATE_WARP (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON)
#define VIDEO_STATE_WARP (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON)
-#define VIDEO_STATE_WARP2_OFF (1 << 1
6
)
-#define VIDEO_STATE_WARP2_ON (1 << 1
7
)
+#define VIDEO_STATE_WARP2_OFF (1 << 1
8
)
+#define VIDEO_STATE_WARP2_ON (1 << 1
9
)
#define VIDEO_STATE_WARP2 (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON)
#define VIDEO_STATE_WARP2 (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON)
-#define VIDEO_STATE_1STEP_OFF (1 <<
18
)
-#define VIDEO_STATE_1STEP_ON (1 <<
19
)
+#define VIDEO_STATE_1STEP_OFF (1 <<
20
)
+#define VIDEO_STATE_1STEP_ON (1 <<
21
)
#define VIDEO_STATE_1STEP (VIDEO_STATE_1STEP_OFF | VIDEO_STATE_1STEP_ON)
#define VIDEO_STATE_1STEP (VIDEO_STATE_1STEP_OFF | VIDEO_STATE_1STEP_ON)
-#define VIDEO_PRESS_PLAY_ON (1 << 2
0
)
-#define VIDEO_PRESS_PLAY_OFF (1 << 2
1
)
+#define VIDEO_PRESS_PLAY_ON (1 << 2
2
)
+#define VIDEO_PRESS_PLAY_OFF (1 << 2
3
)
#define VIDEO_PRESS_PLAY (VIDEO_PRESS_PLAY_OFF | VIDEO_PRESS_PLAY_ON)
#define VIDEO_PRESS_PLAY (VIDEO_PRESS_PLAY_OFF | VIDEO_PRESS_PLAY_ON)
-#define VIDEO_PRESS_REC_ON (1 << 2
2
)
-#define VIDEO_PRESS_REC_OFF (1 << 2
3
)
+#define VIDEO_PRESS_REC_ON (1 << 2
4
)
+#define VIDEO_PRESS_REC_OFF (1 << 2
5
)
#define VIDEO_PRESS_REC (VIDEO_PRESS_REC_OFF | VIDEO_PRESS_REC_ON)
#define VIDEO_PRESS_REC (VIDEO_PRESS_REC_OFF | VIDEO_PRESS_REC_ON)
-#define VIDEO_PRESS_PAUSE_ON (1 << 2
4
)
-#define VIDEO_PRESS_PAUSE_OFF (1 << 2
5
)
+#define VIDEO_PRESS_PAUSE_ON (1 << 2
6
)
+#define VIDEO_PRESS_PAUSE_OFF (1 << 2
7
)
#define VIDEO_PRESS_PAUSE (VIDEO_PRESS_PAUSE_OFF | VIDEO_PRESS_PAUSE_ON)
#define VIDEO_PRESS_PAUSE (VIDEO_PRESS_PAUSE_OFF | VIDEO_PRESS_PAUSE_ON)
-#define VIDEO_PRESS_STOP_ON (1 << 2
6
)
-#define VIDEO_PRESS_STOP_OFF (1 << 2
7
)
+#define VIDEO_PRESS_STOP_ON (1 << 2
8
)
+#define VIDEO_PRESS_STOP_OFF (1 << 2
9
)
#define VIDEO_PRESS_STOP (VIDEO_PRESS_STOP_OFF | VIDEO_PRESS_STOP_ON)
#define VIDEO_PRESS_STOP (VIDEO_PRESS_STOP_OFF | VIDEO_PRESS_STOP_ON)
-#define VIDEO_PRESS_EJECT_ON (1 <<
28
)
-#define VIDEO_PRESS_EJECT_OFF (1 <<
29
)
+#define VIDEO_PRESS_EJECT_ON (1 <<
30
)
+#define VIDEO_PRESS_EJECT_OFF (1 <<
31
)
#define VIDEO_PRESS_EJECT (VIDEO_PRESS_EJECT_OFF | VIDEO_PRESS_EJECT_ON)
/* tags to draw video display labels or symbols only */
#define VIDEO_PRESS_EJECT (VIDEO_PRESS_EJECT_OFF | VIDEO_PRESS_EJECT_ON)
/* tags to draw video display labels or symbols only */
@@
-93,47
+96,58
@@
struct TapeButtonInfo
{
struct TapeButtonInfo
{
- struct
Rect
eject;
- struct
Rect
stop;
- struct
Rect
pause;
- struct
Rect
record;
- struct
Rect
play;
+ struct
XY
eject;
+ struct
XY
stop;
+ struct
XY
pause;
+ struct
XY
record;
+ struct
XY
play;
};
struct TapeSymbolInfo
{
};
struct TapeSymbolInfo
{
- struct
Rect
eject;
- struct
Rect
stop;
- struct
Rect
pause;
- struct
Rect
record;
- struct
Rect
play;
- struct
Rect
fast_forward;
- struct
Rect
warp_forward;
- struct
Rect
warp_forward_blind;
- struct
Rect
pause_before_end;
- struct
Rect
single_step;
+ struct
XY
eject;
+ struct
XY
stop;
+ struct
XY
pause;
+ struct
XY
record;
+ struct
XY
play;
+ struct
XY
fast_forward;
+ struct
XY
warp_forward;
+ struct
XY
warp_forward_blind;
+ struct
XY
pause_before_end;
+ struct
XY
single_step;
};
struct TapeLabelInfo
{
};
struct TapeLabelInfo
{
- struct
Rect
eject;
- struct
Rect
stop;
- struct
Rect
pause;
- struct
Rect
record;
- struct
Rect
play;
- struct
Rect
fast_forward;
- struct
Rect
warp_forward;
- struct
Rect
warp_forward_blind;
- struct
Rect
pause_before_end;
- struct
Rect
single_step;
- struct
Rect
date;
- struct
Rect
time;
+ struct
XY
eject;
+ struct
XY
stop;
+ struct
XY
pause;
+ struct
XY
record;
+ struct
XY
play;
+ struct
XY
fast_forward;
+ struct
XY
warp_forward;
+ struct
XY
warp_forward_blind;
+ struct
XY
pause_before_end;
+ struct
XY
single_step;
+ struct
XY
date;
+ struct
XY
time;
};
struct TapeTextInfo
{
struct TextPosInfo date;
};
struct TapeTextInfo
{
struct TextPosInfo date;
+ struct TextPosInfo date_yyyy;
+ struct TextPosInfo date_yy;
+ struct TextPosInfo date_mon;
+ struct TextPosInfo date_mm;
+ struct TextPosInfo date_dd;
+
struct TextPosInfo time;
struct TextPosInfo time;
+ struct TextPosInfo time_hh;
+ struct TextPosInfo time_mm;
+ struct TextPosInfo time_ss;
+
+ struct TextPosInfo frame;
};
struct TapeInfo
};
struct TapeInfo
@@
-148,6
+162,7
@@
struct TapeInfo
unsigned int date;
unsigned int counter;
unsigned int length;
unsigned int date;
unsigned int counter;
unsigned int length;
+ unsigned int length_frames;
unsigned int length_seconds;
unsigned int delay_played;
boolean pause_before_death;
unsigned int length_seconds;
unsigned int delay_played;
boolean pause_before_death;
@@
-201,7
+216,8
@@
void TapeStopPlaying(void);
byte *TapePlayAction(void);
void TapeStop(void);
void TapeErase(void);
byte *TapePlayAction(void);
void TapeStop(void);
void TapeErase(void);
-unsigned int GetTapeLength(void);
+unsigned int GetTapeLengthFrames(void);
+unsigned int GetTapeLengthSeconds(void);
void TapeQuickSave(void);
void TapeQuickLoad(void);
void InsertSolutionTape(void);
void TapeQuickSave(void);
void TapeQuickLoad(void);
void InsertSolutionTape(void);