Fix early mech dismount leaving you armed (cataclysmbnteam#2781)

* Fix early mech dismount leaving you armed * refactor: use auto --------- Co-authored-by: scarf <[email protected]>
mythosmod · May 13, 2023 · 642ff9a · 642ff9a
1 parent 7bbaa01
commit 642ff9a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/character.cpp b/src/character.cpp
@@ -994,13 +994,16 @@ void Character::mount_creature( monster &z )
         guy.setpos( pnt );
     }
     z.facing = facing;
-    add_msg_if_player( m_good, _( "You climb on the %s." ), z.get_name() );
-    if( z.has_flag( MF_RIDEABLE_MECH ) ) {
-        if( !z.type->mech_weapon.is_empty() ) {
-            item mechwep = item( z.type->mech_weapon );
-            wield( mechwep );
+    // Make sure something didn't interrupt this process and knock the player off partway through!
+    if( has_effect( effect_riding ) ) {
+        add_msg_if_player( m_good, _( "You climb on the %s." ), z.get_name() );
+        if( z.has_flag( MF_RIDEABLE_MECH ) ) {
+            if( !z.type->mech_weapon.is_empty() ) {
+                auto mechwep = item{ z.type->mech_weapon };
+                wield( mechwep );
+            }
+            add_msg_if_player( m_good, _( "You hear your %s whir to life." ), z.get_name() );
         }
-        add_msg_if_player( m_good, _( "You hear your %s whir to life." ), z.get_name() );
     }
     // some rideable mechs have night-vision
     recalc_sight_limits();