Merge pull request #34294 from ipcyborg/fix-33594-fire-mode

Fixed wrong gun mode after closing targeting UI.
CleverRaven · Sep 28, 2019 · fcc1976 · fcc1976
2 parents b59c207 + 68a0477
commit fcc1976
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
@@ -772,6 +772,9 @@ bool avatar_action::fire( avatar &you, map &m )
     m.draw( g->w_terrain, you.pos() );
     std::vector<tripoint> trajectory = target_handler().target_ui( you, args );
 
+    //may be changed in target_ui
+    gun = args.relevant->gun_current_mode();
+
     if( trajectory.empty() ) {
         bool not_aiming = you.activity.id() != activity_id( "ACT_AIM" );
         if( not_aiming && gun->has_flag( "RELOAD_AND_SHOOT" ) ) {