Merge pull request #76262 from SurFlurer/fix-pulp

Fix pulp acid-filled corpses
CleverRaven · Sep 8, 2024 · 190eb0e · 190eb0e
2 parents a7eca82 + 542cf01
commit 190eb0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -8023,7 +8023,7 @@ void pulp_activity_actor::do_turn( player_activity &act, Character &you )
             const mtype *corpse_mtype = corpse.get_mtype();
             const bool acid_immune = you.is_immune_damage( damage_acid ) ||
                                      you.is_immune_field( fd_acid );
-            if( corpse_mtype->bloodType().obj().has_acid && ( !acid_immune || !pulp_acid ) ) {
+            if( !pulp_acid && corpse_mtype->bloodType().obj().has_acid  && !acid_immune ) {
                 //don't smash acid zombies when auto pulping unprotected
                 continue;
             }

diff --git a/src/game.cpp b/src/game.cpp
@@ -10931,11 +10931,11 @@ point game::place_player( const tripoint &dest_loc, bool quick )
                     }
                 }
                 if( !places.empty() ) {
-                    u.assign_activity( pulp_activity_actor( places, true ) );
+                    u.assign_activity( pulp_activity_actor( places ) );
                 }
             } else {
                 if( corpse_available( u.pos_bub() ) ) {
-                    u.assign_activity( pulp_activity_actor( m.getglobal( u.pos_bub() ), true ) );
+                    u.assign_activity( pulp_activity_actor( m.getglobal( u.pos_bub() ) ) );
                 }
             }
         }

diff --git a/src/handle_action.cpp b/src/handle_action.cpp
@@ -974,7 +974,7 @@ static void smash()
     }
 
     if( should_pulp ) {
-        player_character.assign_activity( pulp_activity_actor( here.getglobal( smashp ) ) );
+        player_character.assign_activity( pulp_activity_actor( here.getglobal( smashp ), true ) );
         return; // don't smash terrain if we've smashed a corpse
     }