Merge pull request CleverRaven#35201 from ymber/bike_firing

Prevent bicycle archery
Inglonias · Nov 7, 2019 · a31fa5b · a31fa5b
2 parents 8291e8d + 286a5f7
commit a31fa5b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
@@ -631,7 +631,8 @@ bool avatar_action::fire_check( avatar &you, const map &m, const targeting_data
         }
 
         const optional_vpart_position vp = m.veh_at( you.pos() );
-        if( vp && vp->vehicle().player_in_control( you ) && mode_map.second->is_two_handed( you ) ) {
+        if( vp && vp->vehicle().player_in_control( you ) && ( mode_map.second->is_two_handed( you ) ||
+                mode_map.second->has_flag( "FIRE_TWOHAND" ) ) ) {
             messages.push_back( string_format( _( "You can't use your %s while driving!" ),
                                                mode_map.second->tname() ) );
             fireable = false;