projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with TAS snap keys sometimes moving the player (EM engine only)
[rocksndiamonds.git]
/
src
/
game_em
/
input.c
diff --git
a/src/game_em/input.c
b/src/game_em/input.c
index f7542440b6e3270185962a36e1cd3c1a9570920c..b2c79ac7f79e475cb4f34214bd0e897f4d6a0c62 100644
(file)
--- a/
src/game_em/input.c
+++ b/
src/game_em/input.c
@@
-83,7
+83,7
@@
void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
for (i = 0; i < MAX_PLAYERS; i++)
readjoy(action[i], &ply[i]);
for (i = 0; i < MAX_PLAYERS; i++)
readjoy(action[i], &ply[i]);
- UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
+ UpdateEngineValues(screen_x / TILEX, screen_y / TILEY
, ply[0].x, ply[0].y
);
if (frame == 7)
{
if (frame == 7)
{
@@
-137,16
+137,27
@@
void readjoy(byte action, struct PLAYER *ply)
if (action & JOY_BUTTON_2)
drop = 1;
if (action & JOY_BUTTON_2)
drop = 1;
- ply->joy_snap = snap;
+ /* always update drop action */
ply->joy_drop = drop;
ply->joy_drop = drop;
- if (ply->joy_stick || (north | east | south | west))
+ if (ply->joy_stick || (north | east | south | west))
/* (no "| snap"!) */
{
ply->joy_n = north;
ply->joy_e = east;
ply->joy_s = south;
ply->joy_w = west;
{
ply->joy_n = north;
ply->joy_e = east;
ply->joy_s = south;
ply->joy_w = west;
+
+ /* when storing last action, only update snap action with direction */
+ /* (prevents clearing direction if snapping stopped before frame 7) */
+ ply->joy_snap = snap;
}
}
+
+ /* if no direction was stored before, allow setting snap to current state */
+ if (!ply->joy_n &&
+ !ply->joy_e &&
+ !ply->joy_s &&
+ !ply->joy_w)
+ ply->joy_snap = snap;
}
void SaveEngineSnapshotValues_EM()
}
void SaveEngineSnapshotValues_EM()