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
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 0319a8df9594e7c3aad85dec2ce7683730c1f74e..e20f50fa6101ce28bff631c2a0016ba5703f3575 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-42,6
+42,13
@@
#define SNAPSHOT_MODE_EVERY_COLLECT 3
#define SNAPSHOT_MODE_DEFAULT SNAPSHOT_MODE_OFF
#define SNAPSHOT_MODE_EVERY_COLLECT 3
#define SNAPSHOT_MODE_DEFAULT SNAPSHOT_MODE_OFF
+// values for game action events handled by game engine
+#define GAME_EVENTS_NONE 0
+#define GAME_EVENTS_KEYS (1 << 0)
+#define GAME_EVENTS_MOUSE (1 << 1)
+
+#define GAME_EVENTS_DEFAULT GAME_EVENTS_KEYS
+
struct GamePanelInfo
{
struct GamePanelInfo
{
@@
-129,6
+136,9
@@
struct GameButtonInfo
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
+
+ struct XY touch_stop;
+ struct XY touch_pause;
};
struct GameSnapshotInfo
};
struct GameSnapshotInfo
@@
-175,6
+185,9
@@
struct GameInfo
boolean max_num_changes_per_frame;
boolean use_reverse_scan_direction;
boolean max_num_changes_per_frame;
boolean use_reverse_scan_direction;
+ // bit mask to indicate game action events handled by game engine
+ int event_mask;
+
// variable within running game
int yamyam_content_nr;
boolean robot_wheel_active;
// variable within running game
int yamyam_content_nr;
boolean robot_wheel_active;
@@
-212,7
+225,7
@@
struct GameInfo
// values for the new EMC elements
int lenses_time_left;
int magnify_time_left;
// values for the new EMC elements
int lenses_time_left;
int magnify_time_left;
- boolean ball_
stat
e;
+ boolean ball_
activ
e;
int ball_content_nr;
// values for player idle animation (no effect on engine)
int ball_content_nr;
// values for player idle animation (no effect on engine)
@@
-234,6
+247,7
@@
struct GameInfo
int centered_player_nr;
int centered_player_nr_next;
boolean set_centered_player;
int centered_player_nr;
int centered_player_nr_next;
boolean set_centered_player;
+ boolean set_centered_player_wrap;
// values for random number generator initialization after snapshot
unsigned int num_random_calls;
// values for random number generator initialization after snapshot
unsigned int num_random_calls;
@@
-275,7
+289,6
@@
struct PlayerInfo
int client_nr; // network client identifier
byte action; // action from local input device
int client_nr; // network client identifier
byte action; // action from local input device
- byte mapped_action; // action mapped from device to player
byte effective_action; /* action acknowledged from network server
or summarized over all configured input
devices when in single player mode */
byte effective_action; /* action acknowledged from network server
or summarized over all configured input
devices when in single player mode */
@@
-453,6
+466,7
@@
void CreateGameButtons(void);
void FreeGameButtons(void);
void MapUndoRedoButtons(void);
void UnmapUndoRedoButtons(void);
void FreeGameButtons(void);
void MapUndoRedoButtons(void);
void UnmapUndoRedoButtons(void);
+void ModifyPauseButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);
void RedrawGameButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);
void RedrawGameButtons(void);