static void readjoy(byte action, struct PLAYER *ply)
{
- int north = 0, east = 0, south = 0, west = 0;
- int snap = 0, drop = 0;
+ boolean north = FALSE;
+ boolean east = FALSE;
+ boolean south = FALSE;
+ boolean west = FALSE;
+ boolean snap = FALSE;
+ boolean drop = FALSE;
if (game_em.use_single_button && action & (JOY_BUTTON_1 | JOY_BUTTON_2))
action |= JOY_BUTTON_1 | JOY_BUTTON_2;
if (action & JOY_LEFT)
- west = 1;
+ west = TRUE;
if (action & JOY_RIGHT)
- east = 1;
+ east = TRUE;
if (action & JOY_UP)
- north = 1;
+ north = TRUE;
if (action & JOY_DOWN)
- south = 1;
+ south = TRUE;
if (action & JOY_BUTTON_1)
- snap = 1;
+ snap = TRUE;
if (action & JOY_BUTTON_2)
- drop = 1;
+ drop = TRUE;
/* always update drop action */
ply->joy_drop = drop;
game_em.random = game_em.random * 129 + 1;
- frame = (frame - 1) & 7;
+ frame = (frame + 1) % 8;
for (i = 0; i < MAX_PLAYERS; i++)
readjoy(action[i], &ply[i]);
UpdateEngineValues(screen_x / TILEX, screen_y / TILEY, ply[0].x, ply[0].y);
- if (frame == 7)
- {
- logic_players();
- logic_objects();
- }
-
- if (frame == 6)
- {
- logic_globals();
- }
+ logic();
for (i = 0; i < MAX_PLAYERS; i++)
if (ply[i].joy_drop &&