projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added handling 64-bit random value bug with old tapes in EM engine
[rocksndiamonds.git]
/
src
/
tape.h
diff --git
a/src/tape.h
b/src/tape.h
index d2878581ed8942dba68c668cbf349083d2161557..d5a19ac89c61c5eb890f21e0b1de6828bca28882 100644
(file)
--- a/
src/tape.h
+++ b/
src/tape.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// tape.h
// ============================================================================
// ----------------------------------------------------------------------------
// tape.h
// ============================================================================
@@
-21,19
+21,23
@@
// values for tape properties
#define MAX_TAPE_LEN (1000 * FRAMES_PER_SECOND) // max.time x fps
// values for tape properties
#define MAX_TAPE_LEN (1000 * FRAMES_PER_SECOND) // max.time x fps
-// values for tape
mouse ac
tions
+// values for tape
action array posi
tions
#define TAPE_ACTION_LX (MAX_PLAYERS + 0)
#define TAPE_ACTION_LY (MAX_PLAYERS + 1)
#define TAPE_ACTION_BUTTON (MAX_PLAYERS + 2)
#define MAX_TAPE_ACTIONS (MAX_PLAYERS + 3)
#define TAPE_ACTION_LX (MAX_PLAYERS + 0)
#define TAPE_ACTION_LY (MAX_PLAYERS + 1)
#define TAPE_ACTION_BUTTON (MAX_PLAYERS + 2)
#define MAX_TAPE_ACTIONS (MAX_PLAYERS + 3)
-// values for tape action
event
s stored in tape file
-#define TAPE_
EVENTS_KEYS_ONLY
0
-#define TAPE_
EVENTS_MOUSE_ONLY
1
-#define TAPE_
EVENTS_KEYS_AND_MOUSE
2
+// values for tape actions stored in tape file
+#define TAPE_
USE_KEY_ACTIONS_ONLY
0
+#define TAPE_
USE_MOUSE_ACTIONS_ONLY
1
+#define TAPE_
USE_KEY_AND_MOUSE_ACTIONS
2
-#define TAPE_EVENTS_DEFAULT TAPE_EVENTS_KEYS_ONLY
+#define TAPE_ACTIONS_DEFAULT TAPE_USE_KEY_ACTIONS_ONLY
+
+// values for tape properties stored in tape file
+#define TAPE_PROPERTY_NONE 0
+#define TAPE_PROPERTY_EM_RANDOM_BUG (1 << 0)
// some positions in the video tape control window
#define VIDEO_DISPLAY1_XPOS 5
// some positions in the video tape control window
#define VIDEO_DISPLAY1_XPOS 5
@@
-198,7
+202,12
@@
struct TapeInfo
int centered_player_nr_next;
boolean set_centered_player;
int centered_player_nr_next;
boolean set_centered_player;
- int event_mask; // game action events stored in tape actions
+ // flags to indicate which game actions are stored in this tape
+ boolean use_key_actions;
+ boolean use_mouse_actions;
+
+ // bits to indicate which tape properties are stored in this tape
+ byte property_bits;
struct
{
struct
{