X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=b46399039058863e9c4ee81eafe5e208fd6e1377;hb=1e4a6b46371858fdb85052eec3e7143732ff91b5;hp=f123b4377a748dcc86bdbfc8166f0f90a37e93c7;hpb=2d235297197dd0c325184f7fc401d9c5c41c2616;p=rocksndiamonds.git diff --git a/src/game_em/input.c b/src/game_em/input.c index f123b437..b4639903 100644 --- a/src/game_em/input.c +++ b/src/game_em/input.c @@ -107,6 +107,19 @@ void GameActions_EM(byte action) if (game_frame_delay_value > 0) /* do not redraw values in warp mode */ DrawGameDoorValues_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 } @@ -114,7 +127,8 @@ void GameActions_EM(byte action) void readjoy(byte action) { - unsigned int north = 0, east = 0, south = 0, west = 0, fire = 0; + unsigned int north = 0, east = 0, south = 0, west = 0; + unsigned int snap = 0, drop = 0; if (action & JOY_LEFT) west = 1; @@ -129,10 +143,14 @@ void readjoy(byte action) south = 1; if (action & JOY_BUTTON_1) - fire = 1; + snap = 1; + + if (action & JOY_BUTTON_2) + drop = 1; #if 1 - ply1.joy_fire = fire; + ply1.joy_snap = snap; + ply1.joy_drop = drop; if (ply1.joy_stick || (north | east | south | west)) { ply1.joy_n = north; @@ -140,8 +158,11 @@ void readjoy(byte action) ply1.joy_s = south; ply1.joy_w = west; } + #else - ply2.joy_fire = fire; + + ply2.joy_snap = snap; + ply2.joy_drop = drop; if (ply2.joy_stick || (north | east | south | west)) { ply2.joy_n = north;