From 79d1f6b5e2b6f42a8bc98014c5b05b45b30b8114 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 22 Jul 2022 17:35:13 -0700 Subject: Updated to 2022-07-22-1520. Fix two patches for this update. --- revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch') diff --git a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch b/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch index c04562e..8840161 100644 --- a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch +++ b/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch @@ -31,7 +31,7 @@ index 9bdbf04379..52ffef4532 100644 static const std::string flag_NO_PACKED( "NO_PACKED" ); static const std::string flag_NO_STERILE( "NO_STERILE" ); static const std::string flag_NO_UNWIELD( "NO_UNWIELD" ); -@@ -2019,10 +2016,8 @@ void Character::perform_uninstall( bionic_id bid, int difficulty, int success, +@@ -2019,10 +2016,8 @@ if( bid->itype().is_valid() ) { cbm = item( bid.c_str() ); } @@ -39,10 +39,10 @@ index 9bdbf04379..52ffef4532 100644 cbm.set_flag( flag_NO_STERILE ); cbm.set_flag( flag_NO_PACKED ); - cbm.faults.emplace( fault_bionic_salvaged ); - g->m.add_item( pos(), cbm ); + here.add_item( pos(), cbm ); } else { g->events().send( getID(), bid ); -@@ -2094,10 +2089,8 @@ bool Character::uninstall_bionic( const bionic &target_cbm, monster &installer, +@@ -2094,10 +2089,8 @@ patient.remove_bionic( target_cbm.id ); const itype_id iid = itemtype.is_valid() ? itemtype : itype_burnt_out_bionic; item cbm( iid, calendar::start_of_cataclysm ); @@ -50,7 +50,7 @@ index 9bdbf04379..52ffef4532 100644 cbm.set_flag( flag_NO_STERILE ); cbm.set_flag( flag_NO_PACKED ); - cbm.faults.emplace( fault_bionic_salvaged ); - g->m.add_item( patient.pos(), cbm ); + get_map().add_item( patient.pos(), cbm ); } else { bionics_uninstall_failure( installer, patient, difficulty, success, adjusted_skill ); -- -- cgit v1.2.1