Trigger both Here and There Action events. (Fixes EasyRPG#669)

Ghabry · Dec 11, 2015 · 51abc6d · 51abc6d
1 parent aeecfa9
commit 51abc6d
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/game_player.cpp b/src/game_player.cpp
@@ -399,13 +399,10 @@ bool Game_Player::CheckActionEvent() {
 	if (InAirship())
 		return false;
 
-	if (CheckEventTriggerHere({RPG::EventPage::Trigger_action})) {
-		return true;
-	}
-
-	return CheckEventTriggerThere({RPG::EventPage::Trigger_action,
-		RPG::EventPage::Trigger_touched, RPG::EventPage::Trigger_collision});
+	bool result = CheckEventTriggerHere({ RPG::EventPage::Trigger_action });
 
+	return CheckEventTriggerThere({ RPG::EventPage::Trigger_action,
+		RPG::EventPage::Trigger_touched, RPG::EventPage::Trigger_collision }) || result;
 }
 
 bool Game_Player::CheckTouchEvent() {