Removes dead code (CleverRaven#70346)

* Remove dead code * Fix comment --------- Co-authored-by: Fris0uman <[email protected]>
gkarfakis19 · Dec 22, 2023 · 4d710e5 · 4d710e5
1 parent c390b86
commit 4d710e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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();
         /**