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

Improve player vehicle exit logic #726

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve player vehicle exit logic #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b2ac30
Improve player vehicle exit logic
seeseemelk Sep 29, 2019
db1c405
Replace tabs with spaces
seeseemelk Oct 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions rwengine/src/ai/CharacterController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,9 @@ bool Activities::EnterVehicle::update(CharacterObject *character,

bool Activities::ExitVehicle::update(CharacterObject *character,
CharacterController *controller) {
/// @todo Acitivty must be cancelled if the player lets go of the
/// the enter/exit vehicle key and the exit animation has not yet
/// started.
RW_UNUSED(controller);

if (jacked) {
Expand Down
2 changes: 1 addition & 1 deletion rwengine/src/objects/VehicleObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ void VehicleObject::setOccupant(size_t seat, GameObject* occupant) {
}

bool VehicleObject::canOccupantExit() const {
return getVelocity() <= kVehicleMaxExitVelocity;
return abs(getVelocity()) <= kVehicleMaxExitVelocity;
}

bool VehicleObject::isOccupantDriver(size_t seat) const {
Expand Down
12 changes: 11 additions & 1 deletion rwgame/states/IngameState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,24 @@ void IngameState::tick(float dt) {
} else if (glm::length2(movement) > 0.001f) {
if (player->isCurrentActivity(
ai::Activities::EnterVehicle::ActivityName)) {
// Give up entering a vehicle if we're alreadying doing so
// Give up entering a vehicle if we're already doing so
player->skipActivity();
}
}

if (player->getCharacter()->getCurrentVehicle()) {
auto vehicle = player->getCharacter()->getCurrentVehicle();
vehicle->setHandbraking(held(GameInputState::Handbrake));
if (player->isCurrentActivity(
ai::Activities::ExitVehicle::ActivityName)) {
// The player cannot accelerate while exiting.
// He can, however, brake in the opposite direction of movement.
int velocitySign = vehicle->getVelocity() >= 0 ? 1 : -1;
int movementSign = movement.x >= 0 ? 1 : -1;
if (velocitySign == movementSign) {
movement.x = 0;
}
}
player->setMoveDirection(movement);
} else {
if (pressed(GameInputState::Jump)) {
Expand Down