From 4d710e5f1be3ed4948abf305a5c01355baa29bbe Mon Sep 17 00:00:00 2001 From: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Date: Fri, 22 Dec 2023 05:48:45 +0100 Subject: [PATCH] Removes dead code (#70346) * Remove dead code * Fix comment --------- Co-authored-by: Fris0uman --- data/raw/keybindings.json | 7 ------- src/veh_appliance.cpp | 1 - src/veh_appliance.h | 6 +++--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json index a4b63ebdbb13b..1c0bd5f51b150 100644 --- a/data/raw/keybindings.json +++ b/data/raw/keybindings.json @@ -1737,13 +1737,6 @@ "name": "Plug in appliance", "bindings": [ { "input_method": "keyboard_any", "key": "g" } ] }, - { - "type": "keybinding", - "id": "UNPLUG", - "category": "APP_INTERACT", - "name": "Unplug power connections", - "bindings": [ { "input_method": "keyboard_any", "key": "u" } ] - }, { "type": "keybinding", "id": "MERGE", diff --git a/src/veh_appliance.cpp b/src/veh_appliance.cpp index b26fab2e82eea..8b1227c72d82c 100644 --- a/src/veh_appliance.cpp +++ b/src/veh_appliance.cpp @@ -147,7 +147,6 @@ veh_app_interact::veh_app_interact( vehicle &veh, const point &p ) ctxt.register_action( "SIPHON" ); ctxt.register_action( "RENAME" ); ctxt.register_action( "REMOVE" ); - ctxt.register_action( "UNPLUG" ); ctxt.register_action( "MERGE" ); } diff --git a/src/veh_appliance.h b/src/veh_appliance.h index 391ef63be4298..4b5e73bfab8b5 100644 --- a/src/veh_appliance.h +++ b/src/veh_appliance.h @@ -99,9 +99,9 @@ class veh_app_interact */ bool can_siphon(); /** - * Checks whether the current appliance has any power connections that - * can be disconnected by the player. - * @returns True if the appliance can be unplugged. + * Checks whether the current appliance is power storage + * or powergen or a cable and can thus be merged into a powergrid. + * @returns True if the appliance can be merged. */ bool can_merge(); /**