Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 02:12:45 +01:00
Code Issues Projects Releases Activity

Merge pull request #686 from vflyson/patch-1

Browse Source 
Prevent weapon use while driving
This commit is contained in:
Daniel Evans 2019-01-18 20:42:50 +00:00 committed by GitHub
commit 530a7d35ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rwengine/src/ai/CharacterController.cpp
View File

@ -619,6 +619,11 @@ bool Activities::UseItem::update(CharacterObject *character,
auto shootcycle = find_cycle(weapon->animation1);
auto throwcycle = find_cycle(weapon->animation2);
// No weapon except for Uzi can be used while in a vehicle
if (character->getCurrentVehicle() && weapon->name != "uzi") {
return false;
}
// Instant hit weapons loop their anim
// Thrown projectiles have lob / throw.