Allow toggle_engine bind to work on all vehicles

StyledStrike · Jan 20, 2025 · f1b5bff · f1b5bff
1 parent 8c30dd6
commit f1b5bff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/lua/entities/base_glide_aircraft/init.lua b/lua/entities/base_glide_aircraft/init.lua
@@ -243,6 +243,13 @@ function ENT:OnSeatInput( seatIndex, action, pressed )
     if action == "countermeasures" then
         self:FireCountermeasures()
         return true
+
+    elseif action == "toggle_engine" then
+        if self:GetEngineState() == 0 then
+            self:TurnOn()
+        else
+            self:TurnOff()
+        end
     end
 end
 

diff --git a/lua/entities/base_glide_tank/init.lua b/lua/entities/base_glide_tank/init.lua
@@ -60,6 +60,19 @@ function ENT:TurnOff()
     self.brake = 0.5
 end
 
+--- Implement this base class function.
+function ENT:OnSeatInput( seatIndex, action, pressed )
+    if not pressed or seatIndex > 1 then return end
+
+    if action == "toggle_engine" then
+        if self:GetEngineState() == 0 then
+            self:TurnOn()
+        else
+            self:TurnOff()
+        end
+    end
+end
+
 --- Override this base class function.
 function ENT:OnTakeDamage( dmginfo )
     if dmginfo:IsDamageType( 64 ) then -- DMG_BLAST

diff --git a/lua/glide/client/config.lua b/lua/glide/client/config.lua
@@ -559,6 +559,7 @@ function Config:OpenFrame()
 
     theme:CreateHeader( panelKeyboard, L"input.general_controls" )
     CreateBinderButton( panelKeyboard, L"input.switch_weapon", "switch_weapon", generalBinds.switch_weapon, OnChangeGeneralBind )
+    CreateBinderButton( panelKeyboard, L"input.toggle_engine", "toggle_engine", generalBinds.toggle_engine, OnChangeGeneralBind )
 
     local landBinds = binds["land_controls"]
 
@@ -581,7 +582,6 @@ function Config:OpenFrame()
     CreateBinderButton( panelKeyboard, L"input.siren", "siren", landBinds.siren, OnChangeLandBind )
     CreateBinderButton( panelKeyboard, L"input.headlights", "headlights", landBinds.headlights, OnChangeLandBind )
     CreateBinderButton( panelKeyboard, L"input.reduce_throttle", "reduce_throttle", landBinds.reduce_throttle, OnChangeLandBind )
-    CreateBinderButton( panelKeyboard, L"input.toggle_engine", "toggle_engine", landBinds.toggle_engine, OnChangeLandBind )
 
     CreateBinderButton( panelKeyboard, L"input.lean_forward", "lean_forward", landBinds.lean_forward, OnChangeLandBind )
     CreateBinderButton( panelKeyboard, L"input.lean_back", "lean_back", landBinds.lean_back, OnChangeLandBind )

diff --git a/lua/glide/sh_input.lua b/lua/glide/sh_input.lua
@@ -11,7 +11,8 @@ Glide.InputCategories = InputCategories
 
 -- Inputs that apply to all vehicle types
 InputCategories["general_controls"] = {
-    ["switch_weapon"] = KEY_R
+    ["switch_weapon"] = KEY_R,
+    ["toggle_engine"] = KEY_I
 }
 
 -- Inputs that only apply to land vehicle types
@@ -28,7 +29,6 @@ InputCategories["land_controls"] = {
     ["siren"] = KEY_L,
     ["headlights"] = KEY_H,
     ["reduce_throttle"] = KEY_LSHIFT,
-    ["toggle_engine"] = KEY_I,
 
     ["lean_forward"] = KEY_UP,
     ["lean_back"] = KEY_DOWN,