projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed functions for correcting playfield buffer position for EM engine
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 45da8607964b7be19a441b0b194fb8b71ffe1352..c32f35e91356cf6800d7a9a50a56c5ab028bda74 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-464,7
+464,7
@@
static void SetPlayerMouseAction(int mx, int my, int button)
local_player->mouse_action.ly = ly;
local_player->mouse_action.button = button;
local_player->mouse_action.ly = ly;
local_player->mouse_action.button = button;
- if (tape.recording && tape.pausing &&
(tape.event_mask & GAME_EVENTS_MOUSE)
)
+ if (tape.recording && tape.pausing &&
tape.use_mouse_actions
)
{
// un-pause a paused game only if mouse button was newly pressed down
if (new_button)
{
// un-pause a paused game only if mouse button was newly pressed down
if (new_button)
@@
-1375,7
+1375,7
@@
static void HandleButtonOrFinger(int mx, int my, int button)
{
if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
HandleButtonOrFinger_FollowFinger(mx, my, button);
{
if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
HandleButtonOrFinger_FollowFinger(mx, my, button);
- else if (
(game.event_mask & GAME_EVENTS_MOUSE)
&& valid_mouse_event)
+ else if (
game.use_mouse_actions
&& valid_mouse_event)
SetPlayerMouseAction(mx, my, button);
}
}
SetPlayerMouseAction(mx, my, button);
}
}
@@
-2098,7
+2098,7
@@
void HandleKey(Key key, int key_status)
if (stored_player[pnr].snap_action)
stored_player[pnr].action |= JOY_BUTTON_SNAP;
if (stored_player[pnr].snap_action)
stored_player[pnr].action |= JOY_BUTTON_SNAP;
- if (tape.recording && tape.pausing &&
(tape.event_mask & GAME_EVENTS_KEYS)
)
+ if (tape.recording && tape.pausing &&
tape.use_key_actions
)
{
if (tape.single_step)
{
{
if (tape.single_step)
{
@@
-2633,7
+2633,7
@@
void HandleJoystick(void)
return;
}
return;
}
- if (tape.recording && tape.pausing &&
(tape.event_mask & GAME_EVENTS_KEYS)
)
+ if (tape.recording && tape.pausing &&
tape.use_key_actions
)
{
if (tape.single_step)
{
{
if (tape.single_step)
{