projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed variable
[rocksndiamonds.git]
/
src
/
game_em
/
input.c
diff --git
a/src/game_em/input.c
b/src/game_em/input.c
index 082dbbd6b6661f0e0e9b01c1078a0da2a45020b5..6eadbbdf0d2ca4aec9d50b6442e9270659aab066 100644
(file)
--- a/
src/game_em/input.c
+++ b/
src/game_em/input.c
@@
-6,19
+6,15
@@
#include "main_em.h"
#include "main_em.h"
-unsigned int RandomEM;
-
-struct LEVEL lev;
+struct CAVE cav;
+struct LOGIC lev;
struct PLAYER ply[MAX_PLAYERS];
struct PLAYER ply[MAX_PLAYERS];
-extern int screen_x;
-extern int screen_y;
-
struct EngineSnapshotInfo_EM engine_snapshot_em;
void game_init_random(void)
{
struct EngineSnapshotInfo_EM engine_snapshot_em;
void game_init_random(void)
{
-
RandomEM
= 1684108901;
+
game_em.random
= 1684108901;
}
void game_init_cave_buffers(void)
}
void game_init_cave_buffers(void)
@@
-71,7
+67,7
@@
void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
int i;
boolean any_player_dropping = FALSE;
int i;
boolean any_player_dropping = FALSE;
-
RandomEM = RandomEM
* 129 + 1;
+
game_em.random = game_em.random
* 129 + 1;
frame = (frame - 1) & 7;
frame = (frame - 1) & 7;
@@
-168,9
+164,7
@@
void SaveEngineSnapshotValues_EM(void)
engine_snapshot_em.game_em = game_em;
engine_snapshot_em.lev = lev;
engine_snapshot_em.game_em = game_em;
engine_snapshot_em.lev = lev;
- engine_snapshot_em.RandomEM = RandomEM;
engine_snapshot_em.frame = frame;
engine_snapshot_em.frame = frame;
-
engine_snapshot_em.screen_x = screen_x;
engine_snapshot_em.screen_y = screen_y;
engine_snapshot_em.screen_x = screen_x;
engine_snapshot_em.screen_y = screen_y;
@@
-185,9
+179,7
@@
void LoadEngineSnapshotValues_EM(void)
game_em = engine_snapshot_em.game_em;
lev = engine_snapshot_em.lev;
game_em = engine_snapshot_em.game_em;
lev = engine_snapshot_em.lev;
- RandomEM = engine_snapshot_em.RandomEM;
frame = engine_snapshot_em.frame;
frame = engine_snapshot_em.frame;
-
screen_x = engine_snapshot_em.screen_x;
screen_y = engine_snapshot_em.screen_y;
screen_x = engine_snapshot_em.screen_x;
screen_y = engine_snapshot_em.screen_y;