From fc74bc0bdaa45f861017061025c56f3148cf1b59 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 20 Feb 2020 18:17:11 +0100 Subject: [PATCH] changed order of some structures in EM engine --- src/game_em/emerald.h | 62 ++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h index bceb8473..50038d4d 100644 --- a/src/game_em/emerald.h +++ b/src/game_em/emerald.h @@ -572,7 +572,7 @@ enum enum { - SOUND_blank = 0, /* player walks on blank */ + SOUND_blank, /* player walks on blank */ SOUND_roll, /* player pushes stone/bomb/nut/spring */ SOUND_stone, /* stone hits ground */ SOUND_nut, /* nut hits ground */ @@ -616,6 +616,37 @@ enum // data structure definitions // ---------------------------------------------------------------------------- +/* structure used by logic() for gameplay */ + +struct PLAYER +{ + int num; + int exists; + int alive_initial; + int alive; + + int dynamite; + int dynamite_cnt; + int keys; + int anim; + + int x; + int y; + int oldx; + int oldy; + + int last_move_dir; + + int joy_n:1; + int joy_e:1; + int joy_s:1; + int joy_w:1; + int joy_snap:1; + int joy_drop:1; + int joy_stick:1; + int joy_spin:1; +}; + struct LOGIC { int width; /* cave width */ @@ -703,33 +734,4 @@ struct LOGIC short **boom; }; -struct PLAYER -{ - int num; - int exists; - int alive_initial; - int alive; - - int dynamite; - int dynamite_cnt; - int keys; - int anim; - - int x; - int y; - int oldx; - int oldy; - - int last_move_dir; - - int joy_n:1; - int joy_e:1; - int joy_s:1; - int joy_w:1; - int joy_snap:1; - int joy_drop:1; - int joy_stick:1; - int joy_spin:1; -}; - #endif // EMERALD_H -- 2.34.1