Add reload wielded keybinding (#36658)

CleverRaven · Jan 5, 2020 · ca62787 · ca62787
1 parent 264b304
commit ca62787
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
@@ -1686,6 +1686,12 @@
     "category": "DEFAULTMODE",
     "id": "reload_weapon"
   },
+  {
+    "type": "keybinding",
+    "name": "Reload Wielded Item",
+    "category": "DEFAULTMODE",
+    "id": "reload_wielded"
+  },
   {
     "type": "keybinding",
     "name": "Unload or Empty Wielded Item",

diff --git a/src/action.cpp b/src/action.cpp
@@ -227,6 +227,8 @@ std::string action_ident( action_id act )
             return "reload_item";
         case ACTION_RELOAD_WEAPON:
             return "reload_weapon";
+        case ACTION_RELOAD_WIELDED:
+            return "reload_wielded";
         case ACTION_UNLOAD:
             return "unload";
         case ACTION_MEND:
@@ -860,6 +862,7 @@ action_id handle_action_menu()
             REGISTER_ACTION( ACTION_FIRE );
             REGISTER_ACTION( ACTION_RELOAD_ITEM );
             REGISTER_ACTION( ACTION_RELOAD_WEAPON );
+            REGISTER_ACTION( ACTION_RELOAD_WIELDED );
             REGISTER_ACTION( ACTION_CAST_SPELL );
             REGISTER_ACTION( ACTION_SELECT_FIRE_MODE );
             REGISTER_ACTION( ACTION_THROW );

diff --git a/src/action.h b/src/action.h
@@ -159,6 +159,8 @@ enum action_id : int {
     ACTION_RELOAD_ITEM,
     /** Attempt to reload wielded weapon, then fall back to the load item select menu */
     ACTION_RELOAD_WEAPON,
+    /** Attempt to reload wielded object*/
+    ACTION_RELOAD_WIELDED,
     /** Open the unload item (e.g. firearms) select menu */
     ACTION_UNLOAD,
     /** Open the mending menu (e.g. when using a sewing kit) */

diff --git a/src/game.cpp b/src/game.cpp
@@ -2332,6 +2332,7 @@ input_context get_default_mode_input_context()
     ctxt.register_action( "pick_style" );
     ctxt.register_action( "reload_item" );
     ctxt.register_action( "reload_weapon" );
+    ctxt.register_action( "reload_wielded" );
     ctxt.register_action( "unload" );
     ctxt.register_action( "throw" );
     ctxt.register_action( "fire" );
@@ -8486,6 +8487,16 @@ void game::reload_item()
     reload( item_loc );
 }
 
+void game::reload_wielded()
+{
+    if( u.weapon.is_null() || !u.weapon.is_reloadable() ) {
+        add_msg( _( "You aren't holding something you can reload." ) );
+        return;
+    }
+    item_location item_loc = item_location( u, &u.weapon );
+    reload( item_loc );
+}
+
 void game::reload_weapon( bool try_everything )
 {
     // As a special streamlined activity, hitting reload repeatedly should:

diff --git a/src/game.h b/src/game.h
@@ -772,6 +772,7 @@ class game
         void reload( item_location &loc, bool prompt = false, bool empty = true );
     public:
         void reload_item(); // Reload an item
+        void reload_wielded();
         void reload_weapon( bool try_everything = true ); // Reload a wielded gun/tool  'r'
         // Places the player at the specified point; hurts feet, lists items etc.
         point place_player( const tripoint &dest );

diff --git a/src/handle_action.cpp b/src/handle_action.cpp
@@ -1922,6 +1922,10 @@ bool game::handle_action()
                 reload_weapon();
                 break;
 
+            case ACTION_RELOAD_WIELDED:
+                reload_wielded();
+                break;
+
             case ACTION_UNLOAD:
                 avatar_action::unload( u );
                 break;