projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed order of game elements in EM engine (no functional change)
[rocksndiamonds.git]
/
src
/
game_em
/
input.c
diff --git
a/src/game_em/input.c
b/src/game_em/input.c
index b8e2e663b1f5f96df79356adc6dea8b8220ba33e..e3e17cb80150b4ea2e1026ab4da5830ec9885669 100644
(file)
--- a/
src/game_em/input.c
+++ b/
src/game_em/input.c
@@
-32,13
+32,13
@@
void game_init_vars(void)
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
- Array[0][y][x] = Z
BORDER
;
+ Array[0][y][x] = Z
border
;
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
- Array[1][y][x] = Z
BORDER
;
+ Array[1][y][x] = Z
border
;
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
- Array[2][y][x] = Z
BORDER
;
+ Array[2][y][x] = Z
border
;
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
Array[3][y][x] = Xblank;
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
Array[3][y][x] = Xblank;
@@
-58,7
+58,7
@@
void game_init_vars(void)
Boom = Index[3];
}
Boom = Index[3];
}
-void InitGameEngine_EM()
+void InitGameEngine_EM(
void
)
{
prepare_em_level();
{
prepare_em_level();
@@
-67,7
+67,7
@@
void InitGameEngine_EM()
RedrawPlayfield_EM(FALSE);
}
RedrawPlayfield_EM(FALSE);
}
-
void UpdateGameDoorValues_EM(
)
+
static void UpdateGameDoorValues_EM(void
)
{
}
{
}
@@
-94,7
+94,6
@@
void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
if (frame == 6)
{
synchro_3();
if (frame == 6)
{
synchro_3();
- sound_play();
UpdateGameDoorValues_EM();
}
UpdateGameDoorValues_EM();
}
@@
-161,9
+160,13
@@
void readjoy(byte action, struct PLAYER *ply)
!ply->joy_s &&
!ply->joy_w)
ply->joy_snap = snap;
!ply->joy_s &&
!ply->joy_w)
ply->joy_snap = snap;
+
+ /* use bug with snap key (mainly TAS keys) sometimes moving the player */
+ if (game_em.use_snap_key_bug)
+ ply->joy_snap = snap;
}
}
-void SaveEngineSnapshotValues_EM()
+void SaveEngineSnapshotValues_EM(
void
)
{
int i, j, k;
{
int i, j, k;
@@
-190,7
+193,7
@@
void SaveEngineSnapshotValues_EM()
engine_snapshot_em.Array[i][j][k] = Array[i][j][k];
}
engine_snapshot_em.Array[i][j][k] = Array[i][j][k];
}
-void LoadEngineSnapshotValues_EM()
+void LoadEngineSnapshotValues_EM(
void
)
{
int i, j, k;
{
int i, j, k;