Merge branch 'master' into extraspells

This commit is contained in:
Andrei "Akari" Alexeyev 2017-03-07 01:57:32 +02:00
commit c6c8e58686
2 changed files with 4 additions and 1 deletions

View file

@ -399,6 +399,9 @@ void player_applymovement(Player *plr) {
}
void player_input_workaround(Player *plr) {
if(global.dialog)
return;
for(KeyIndex key = KEYIDX_FIRST; key <= KEYIDX_LAST; ++key) {
int flag = key_to_inflag(key);

View file

@ -348,8 +348,8 @@ void stage_input(void) {
replay_stage_event(global.replay_stage, global.frames, EV_RELEASE, KEY_SKIP);
}
player_applymovement(&global.plr);
player_input_workaround(&global.plr);
player_applymovement(&global.plr);
}
void draw_hud(void) {