Use or Apply Wielded, default key capital A.

action.cpp

@@ -135,6 +135,8 @@ std::string action_ident(action_id act)
    return "organize";
   case ACTION_USE:
    return "apply";
+  case ACTION_USE_WIELDED:
+   return "apply_wielded";
   case ACTION_WEAR:
    return "wear";
   case ACTION_TAKE_OFF:
@@ -172,7 +174,7 @@ std::string action_ident(action_id act)
   case ACTION_CONSTRUCT:
    return "construct";
   case ACTION_DISASSEMBLE:
-   return "disassemble";   
+   return "disassemble";
   case ACTION_SLEEP:
    return "sleep";
   case ACTION_TOGGLE_SAFEMODE:
@@ -269,6 +271,8 @@ std::string action_name(action_id act)
    return "Swap Inventory Letters";
   case ACTION_USE:
    return "Apply or Use Item";
+  case ACTION_USE_WIELDED:
+   return "Apply or Use Wielded Item";
   case ACTION_WEAR:
    return "Wear Item";
   case ACTION_TAKE_OFF:

action.h

@@ -29,6 +29,7 @@ ACTION_PEEK,
 ACTION_INVENTORY,
 ACTION_ORGANIZE,
 ACTION_USE,
+ACTION_USE_WIELDED,
 ACTION_WEAR,
 ACTION_TAKE_OFF,
 ACTION_EAT,

game.cpp

@@ -1388,6 +1388,10 @@ input_ret game::get_input(int timeout_ms)
    use_item();
    break;
 
+  case ACTION_USE_WIELDED:
+   use_wielded_item();
+   break;
+
   case ACTION_WEAR:
    wear();
    break;
@@ -4112,6 +4116,11 @@ void game::use_item()
  u.use(this, ch);
 }
 
+void game::use_wielded_item()
+{
+  u.use_wielded(this);
+}
+
 bool game::pl_choose_vehicle (int &x, int &y)
 {
  refresh_all();

game.h

@@ -308,6 +308,7 @@ class game
   void complete_butcher(int index);	// Finish the butchering process
   void eat();	  // Eat food or fuel		'E' (or 'a')
   void use_item();// Use item; also tries E,R,W	'a'
+  void use_wielded_item();
   void wear();	  // Wear armor			'W' (or 'a')
   void takeoff(); // Remove armor		'T'
   void reload();  // Reload a wielded gun/tool	'r'

keypress.cpp

@@ -210,6 +210,7 @@ peek L X\n\
 inventory i\n\
 organize =\n\
 apply a\n\
+apply_wielded A\n\
 wear W\n\
 take_off T\n\
 eat E\n\

player.cpp

@@ -4239,6 +4239,10 @@ bool player::takeoff(game *g, char let)
  return false;
 }
 
+void player::use_wielded(game *g) {
+  use(g, weapon.invlet);
+}
+
 void player::use(game *g, char let)
 {
  item* used = &i_at(let);

player.h

@@ -188,6 +188,7 @@ class player {
  bool wear_item(game *g, item *to_wear);
  bool takeoff(game *g, char let);// Take off item; returns false on fail
  void use(game *g, char let);	// Use a tool
+ void use_wielded(game *g);
  bool install_bionics(game *g, it_bionic* type);	// Install bionics
  void read(game *g, char let);	// Read a book
  void try_to_sleep(game *g);	// '$' command; adds DIS_LYING_DOWN