Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Movement Hero/Vehicles #1404

Merged
merged 5 commits into from Sep 22, 2018
Merged

Movement Hero/Vehicles #1404

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5830f3
Hero in boat/ship can land in a terrain with Boat/ship.
Albeleon Jul 15, 2018
3317dca
Forbid menu_calling input when hero has move route blocked.
Albeleon Jul 15, 2018
5764572
Events can't pass through boats or ships.
Albeleon Jul 15, 2018
b7f307e
When entering in boat/ship, not synchronize vehicle until the hero is…
Albeleon Jul 15, 2018
b1a11ad
Vehicle follows the hero's direction when entering.
Albeleon Jul 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/game_player.cpp
View file
Open in desktop
Expand Up @@ -647,7 +647,9 @@ bool Game_Player::GetOffVehicle() {
if (!InAirship()) {
int front_x = Game_Map::XwithDirection(GetX(), GetDirection());
int front_y = Game_Map::YwithDirection(GetY(), GetDirection());
if (!CanWalk(front_x, front_y))
if (!CanWalk(front_x, front_y)
&& !Game_Map::GetVehicle(Game_Vehicle::Boat)->IsInPosition(front_x, front_y)
&& !Game_Map::GetVehicle(Game_Vehicle::Ship)->IsInPosition(front_x, front_y))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me this looks more like a bug than expected behaviour but because this only happens when Water is walkable it doesn't really matter if we support this or not so I'm fine with it.

return false;
}

Expand Down