Skip to content

Commit

Permalink
Fix progress bar not filling up in Shitigadianzu while the heroine is…
Browse files Browse the repository at this point in the history
… receiving pleasure from monsters.

Remove the IsBlockedByMoveRoute check for event touch collisions. Tests have shown that event touch always happens, even when the hero is moving.
This check was used for fixing EasyRPG#687 but another fix for Player touch in 1ef2aff solved this properly.

Fixes EasyRPG#1412
  • Loading branch information
Ghabry committed Sep 4, 2018
1 parent 23c3f42 commit 8cc3e85
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/game_event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ bool Game_Event::CheckEventTriggerTouch(int x, int y) {
return false;
}

if (Main_Data::game_player->IsInPosition(x, y) && !Main_Data::game_player->IsBlockedByMoveRoute()) {
if (Main_Data::game_player->IsInPosition(x, y)) {
if (Main_Data::game_player->InAirship() && GetLayer() == RPG::EventPage::Layers_same) {
return false;
}
Expand Down

0 comments on commit 8cc3e85

Please sign in to comment.