X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=4028f19a553f692e9dc7a3541358f0ab24d27918;hp=172d69890351a55bcd60b84279d6911a071e3ea8;hb=567cfcb396e3fc031a25362b747dd0a5a096b4ec;hpb=d14ff3d04c44d90b4dc151fd7774946e20da0152 diff --git a/src/game_em/input.c b/src/game_em/input.c index 172d6989..4028f19a 100644 --- a/src/game_em/input.c +++ b/src/game_em/input.c @@ -3,12 +3,10 @@ * handle input from x11 and keyboard and joystick */ -#include "global.h" -#include "display.h" -#include "level.h" +#include "main_em.h" -unsigned long RandomEM; +unsigned int RandomEM; struct LEVEL lev; struct PLAYER ply[MAX_PLAYERS]; @@ -24,6 +22,8 @@ static short Array[4][HEIGHT][WIDTH]; extern int screen_x; extern int screen_y; +struct EngineSnapshotInfo_EM engine_snapshot_em; + void game_init_vars(void) { int x, y; @@ -63,29 +63,18 @@ void InitGameEngine_EM() prepare_em_level(); game_initscreen(); - game_animscreen(); + + RedrawPlayfield_EM(FALSE); } -#if 1 +void UpdateGameDoorValues_EM() +{ +} -void GameActions_EM(byte action[MAX_PLAYERS]) +void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode) { - static unsigned long game_frame_delay = 0; -#if 1 - unsigned long game_frame_delay_value = getGameFrameDelay_EM(20); -#else - unsigned long game_frame_delay_value = getGameFrameDelay_EM(25); -#endif int i; - -#if 0 - /* this is done in screens.c/HandleGameActions() by calling BackToFront() */ - XSync(display, False); /* block until all graphics are drawn */ -#endif - - WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value); - - game_animscreen(); + boolean any_player_dropping = FALSE; RandomEM = RandomEM * 129 + 1; @@ -94,7 +83,7 @@ void GameActions_EM(byte action[MAX_PLAYERS]) 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) { @@ -107,88 +96,24 @@ void GameActions_EM(byte action[MAX_PLAYERS]) synchro_3(); sound_play(); - if (game_frame_delay_value > 0) /* do not redraw values in warp mode */ - DrawGameDoorValues_EM(); + UpdateGameDoorValues_EM(); } -#if 0 - if (lev.time_initial == 0) - lev.time++; - else if (lev.time > 0) - lev.time--; -#endif - -#if 0 - if (lev.time_initial > 0 && - lev.time > 0 && lev.time <= 50 && lev.time % 5 == 0 && setup.time_limit) - play_sound(-1, -1, SAMPLE_time); -#endif -} - -#else - -void GameActions_EM(byte action) -{ - static unsigned long game_frame_delay = 0; -#if 1 - unsigned long game_frame_delay_value = getGameFrameDelay_EM(20); -#else - unsigned long game_frame_delay_value = getGameFrameDelay_EM(25); -#endif - -#if 0 - /* this is done in screens.c/HandleGameActions() by calling BackToFront() */ - XSync(display, False); /* block until all graphics are drawn */ -#endif - - WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value); - - game_animscreen(); - - RandomEM = RandomEM * 129 + 1; - - frame = (frame - 1) & 7; - - readjoy(action); - - UpdateEngineValues(screen_x / TILEX, screen_y / TILEY); - - if (frame == 7) - { - synchro_1(); - synchro_2(); - } - - if (frame == 6) - { - synchro_3(); - sound_play(); + for (i = 0; i < MAX_PLAYERS; i++) + if (ply[i].joy_drop && + ply[i].dynamite && + ply[i].dynamite_cnt > 0 && + ply[i].dynamite_cnt < 5) + any_player_dropping = TRUE; - if (game_frame_delay_value > 0) /* do not redraw values in warp mode */ - DrawGameDoorValues_EM(); - } + CheckSingleStepMode_EM(action, frame, game_em.any_player_moving, + game_em.any_player_snapping, any_player_dropping); -#if 0 - if (lev.time_initial == 0) - lev.time++; - else if (lev.time > 0) - lev.time--; -#endif - -#if 0 - if (lev.time_initial > 0 && - lev.time > 0 && lev.time <= 50 && lev.time % 5 == 0 && setup.time_limit) - play_sound(-1, -1, SAMPLE_time); -#endif + RedrawPlayfield_EM(FALSE); } -#endif - - /* read input device for players */ -#if 1 - void readjoy(byte action, struct PLAYER *ply) { int north = 0, east = 0, south = 0, west = 0; @@ -224,54 +149,56 @@ void readjoy(byte action, struct PLAYER *ply) } } -#else - -void readjoy(byte action) +void SaveEngineSnapshotValues_EM() { - int north = 0, east = 0, south = 0, west = 0; - int snap = 0, drop = 0; + int i, j, k; - if (action & JOY_LEFT) - west = 1; + engine_snapshot_em.game_em = game_em; + engine_snapshot_em.lev = lev; - if (action & JOY_RIGHT) - east = 1; + engine_snapshot_em.RandomEM = RandomEM; + engine_snapshot_em.frame = frame; - if (action & JOY_UP) - north = 1; + engine_snapshot_em.screen_x = screen_x; + engine_snapshot_em.screen_y = screen_y; - if (action & JOY_DOWN) - south = 1; + engine_snapshot_em.Boom = Boom; + engine_snapshot_em.Cave = Cave; + engine_snapshot_em.Next = Next; + engine_snapshot_em.Draw = Draw; - if (action & JOY_BUTTON_1) - snap = 1; + for (i = 0; i < 4; i++) + engine_snapshot_em.ply[i] = ply[i]; - if (action & JOY_BUTTON_2) - drop = 1; + for (i = 0; i < 4; i++) + for (j = 0; j < HEIGHT; j++) + for (k = 0; k < WIDTH; k++) + engine_snapshot_em.Array[i][j][k] = Array[i][j][k]; +} -#if 1 - ply1.joy_snap = snap; - ply1.joy_drop = drop; - if (ply1.joy_stick || (north | east | south | west)) - { - ply1.joy_n = north; - ply1.joy_e = east; - ply1.joy_s = south; - ply1.joy_w = west; - } +void LoadEngineSnapshotValues_EM() +{ + int i, j, k; -#else + game_em = engine_snapshot_em.game_em; + lev = engine_snapshot_em.lev; - ply2.joy_snap = snap; - ply2.joy_drop = drop; - if (ply2.joy_stick || (north | east | south | west)) - { - ply2.joy_n = north; - ply2.joy_e = east; - ply2.joy_s = south; - ply2.joy_w = west; - } -#endif -} + RandomEM = engine_snapshot_em.RandomEM; + frame = engine_snapshot_em.frame; + + screen_x = engine_snapshot_em.screen_x; + screen_y = engine_snapshot_em.screen_y; -#endif + Boom = engine_snapshot_em.Boom; + Cave = engine_snapshot_em.Cave; + Next = engine_snapshot_em.Next; + Draw = engine_snapshot_em.Draw; + + for (i = 0; i < 4; i++) + ply[i] = engine_snapshot_em.ply[i]; + + for (i = 0; i < 4; i++) + for (j = 0; j < HEIGHT; j++) + for (k = 0; k < WIDTH; k++) + Array[i][j][k] = engine_snapshot_em.Array[i][j][k]; +}