From 490bc91f9148b162e07d14781a9a6330d95bf31a Mon Sep 17 00:00:00 2001
From: Vincent Flyson <vflyson@uberspace.net>
Date: Sun, 13 Jan 2019 18:56:37 -0500
Subject: [PATCH] Prevent weapon use while driving

---
 rwengine/src/ai/CharacterController.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rwengine/src/ai/CharacterController.cpp b/rwengine/src/ai/CharacterController.cpp
index f82e37b2..b2d5f2f8 100644
--- a/rwengine/src/ai/CharacterController.cpp
+++ b/rwengine/src/ai/CharacterController.cpp
@@ -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.