projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced flag for game/tape mouse actions by bitmask
[rocksndiamonds.git]
/
src
/
tape.h
diff --git
a/src/tape.h
b/src/tape.h
index dfb0a6270ddcf3428403089217e4054107c5b325..eb0231b15b61a0becea078a19e34661e20e6e702 100644
(file)
--- a/
src/tape.h
+++ b/
src/tape.h
@@
-27,6
+27,15
@@
#define TAPE_ACTION_BUTTON 2
#define TAPE_ACTION_UNUSED 3
#define TAPE_ACTION_BUTTON 2
#define TAPE_ACTION_UNUSED 3
+#define MAX_TAPE_ACTIONS 4
+
+// values for tape action events stored in tape file
+#define TAPE_EVENTS_KEYS_ONLY 0
+#define TAPE_EVENTS_MOUSE_ONLY 1
+#define TAPE_EVENTS_KEYS_AND_MOUSE 2
+
+#define TAPE_EVENTS_DEFAULT TAPE_EVENTS_KEYS_ONLY
+
// some positions in the video tape control window
#define VIDEO_DISPLAY1_XPOS 5
#define VIDEO_DISPLAY1_YPOS 5
// some positions in the video tape control window
#define VIDEO_DISPLAY1_XPOS 5
#define VIDEO_DISPLAY1_YPOS 5
@@
-95,8
+104,8
@@
#define VIDEO_PRESS_EJECT(x) ((x) ? VIDEO_PRESS_EJECT_ON: VIDEO_PRESS_EJECT_OFF)
// tags to draw video display labels or symbols only
#define VIDEO_PRESS_EJECT(x) ((x) ? VIDEO_PRESS_EJECT_ON: VIDEO_PRESS_EJECT_OFF)
// tags to draw video display labels or symbols only
-/
*
(negative values to prevent misinterpretation in DrawVideoDisplay(), where
- the variable "value" is also used for tape length -- better fix this) */
+/
/
(negative values to prevent misinterpretation in DrawVideoDisplay(), where
+// the variable "value" is also used for tape length -- better fix this)
#define VIDEO_DISPLAY_DEFAULT 0
#define VIDEO_DISPLAY_LABEL_ONLY -1
#define VIDEO_DISPLAY_SYMBOL_ONLY -2
#define VIDEO_DISPLAY_DEFAULT 0
#define VIDEO_DISPLAY_LABEL_ONLY -1
#define VIDEO_DISPLAY_SYMBOL_ONLY -2
@@
-190,11
+199,11
@@
struct TapeInfo
int centered_player_nr_next;
boolean set_centered_player;
int centered_player_nr_next;
boolean set_centered_player;
- boolean use_mouse;
+ int event_mask; // game action events stored in tape actions
struct
{
struct
{
- byte action[MAX_
PLAYER
S];
+ byte action[MAX_
TAPE_ACTION
S];
byte delay;
} pos[MAX_TAPE_LEN];
byte delay;
} pos[MAX_TAPE_LEN];