diff options
author | Oxore <oxore@protonmail.com> | 2018-12-07 01:29:30 +0300 |
---|---|---|
committer | Oxore <oxore@protonmail.com> | 2018-12-07 03:22:30 +0300 |
commit | 1a75ab85c0555e6f4b3adb1f7a79dc2eb029ac08 (patch) | |
tree | 5537ec08ae9949d23585603dac9d6e2397970cc0 /src/engine.c | |
parent | 14f2aadae65713192f1ef722050353c4d781f17e (diff) |
Fix lines longer than 80 chars, fix codestyle.pl
codestyle.pl: limit to `src` and `include` dirs only.
Diffstat (limited to 'src/engine.c')
-rw-r--r-- | src/engine.c | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/src/engine.c b/src/engine.c index 41bdc4a..2a5755b 100644 --- a/src/engine.c +++ b/src/engine.c @@ -267,7 +267,8 @@ static void transition_game_over() list_foreach(texts, update_game_over_text); } -static void project_ghost_shape(struct field *fld, size_t idreal, size_t idghost) +static void project_ghost_shape(struct field *fld, size_t idreal, + size_t idghost) { fld->shape[idghost].t = fld->shape[idreal].t; fld->shape[idghost].x = fld->shape[idreal].x; @@ -398,11 +399,11 @@ static void game_keys() /* PAUSE */ if (sfKeyboard_isKeyPressed(sfKeyP)) { if (!(keys & PAUSE)) { - keys = keys | PAUSE; + keys |= PAUSE; signal_pause(); } } else { - keys = keys & ~PAUSE; + keys &= ~PAUSE; } /* UP */ @@ -418,11 +419,11 @@ static void game_keys() /* HARDDROP */ if (sfKeyboard_isKeyPressed(sfKeySpace)) { if (!(keys & HARDDROP)) { - keys = keys | HARDDROP; + keys |= HARDDROP; signal_harddrop(); } } else { - keys = keys & ~HARDDROP; + keys &= ~HARDDROP; } /* DOWN */ @@ -432,51 +433,58 @@ static void game_keys() signal_down(); sfClock_restart(game.repPushDown); } else { - if (sfClock_getElapsedTime(game.repPushDown).microseconds >= moveRepeatLatency2) - keys = keys & ~DOWN; + if (sfClock_getElapsedTime(game.repPushDown).microseconds + >= moveRepeatLatency2) + keys &= ~DOWN; } } else { - keys = keys & ~DOWN; + keys &= ~DOWN; } /* LEFT */ - if (sfKeyboard_isKeyPressed(sfKeyLeft) && !sfKeyboard_isKeyPressed(sfKeyRight)) { + if (sfKeyboard_isKeyPressed(sfKeyLeft) + && !sfKeyboard_isKeyPressed(sfKeyRight)) { if (!(keys & LEFT)) { keys = keys | LEFT; signal_left(); sfClock_restart(game.repKeyLeft); } else if (!(keys & LEFTHOLD)) { - if (sfClock_getElapsedTime(game.repKeyLeft).microseconds >= moveRepeatLatency1) { - keys = keys | LEFTHOLD; - keys = keys & ~LEFT; + if (sfClock_getElapsedTime(game.repKeyLeft).microseconds + >= moveRepeatLatency1) { + keys |= LEFTHOLD; + keys &= ~LEFT; } } else { - if (sfClock_getElapsedTime(game.repKeyLeft).microseconds >= moveRepeatLatency2) - keys = keys & ~LEFT; + if (sfClock_getElapsedTime(game.repKeyLeft).microseconds + >= moveRepeatLatency2) + keys &= ~LEFT; } } else { - keys = keys & ~LEFT; - keys = keys & ~LEFTHOLD; + keys &= ~LEFT; + keys &= ~LEFTHOLD; } /* RIGHT */ - if (sfKeyboard_isKeyPressed(sfKeyRight) && !sfKeyboard_isKeyPressed(sfKeyLeft)) { + if (sfKeyboard_isKeyPressed(sfKeyRight) + && !sfKeyboard_isKeyPressed(sfKeyLeft)) { if (!(keys & RIGHT)) { keys = keys | RIGHT; signal_right(); sfClock_restart(game.repKeyRight); } else if (!(keys & RIGHTHOLD)) { - if (sfClock_getElapsedTime(game.repKeyRight).microseconds >= moveRepeatLatency1) { - keys = keys | RIGHTHOLD; - keys = keys & ~RIGHT; + if (sfClock_getElapsedTime(game.repKeyRight).microseconds + >= moveRepeatLatency1) { + keys |= RIGHTHOLD; + keys &= ~RIGHT; } } else { - if (sfClock_getElapsedTime(game.repKeyRight).microseconds >= moveRepeatLatency2) - keys = keys & ~RIGHT; + if (sfClock_getElapsedTime(game.repKeyRight).microseconds + >= moveRepeatLatency2) + keys &= ~RIGHT; } } else { - keys = keys & ~RIGHT; - keys = keys & ~RIGHTHOLD; + keys &= ~RIGHT; + keys &= ~RIGHTHOLD; } } @@ -485,11 +493,11 @@ static void pause_keys() /* PAUSE */ if (sfKeyboard_isKeyPressed(sfKeyP)) { if (!(keys & PAUSE)) { - keys = keys | PAUSE; + keys |= PAUSE; signal_pause(); } } else { - keys = keys & ~PAUSE; + keys &= ~PAUSE; } } |