From 6f0145c285a448b152692a52796a35384bb03b79 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 8 Jan 2025 19:41:35 -0600 Subject: [PATCH] Revert "always combine_things() after identifying a held item" This reverts commit 364712ef9e0720a4cd41f049bd377b907a7b7936. --- src/game/boe.party.cpp | 4 +--- src/pcedit/pc.action.cpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/game/boe.party.cpp b/src/game/boe.party.cpp index b10a4ea9..900c01d8 100644 --- a/src/game/boe.party.cpp +++ b/src/game/boe.party.cpp @@ -599,11 +599,9 @@ void do_mage_spell(short pc_num,eSpell spell_num,bool freebie) { if(all_identified){ sstr << "already "; }else{ - for(cPlayer& pc : univ.party){ + for(cPlayer& pc : univ.party) for(cItem& item : pc.items) item.ident = true; - pc.combine_things(); - } } sstr << "identified."; ASB(sstr.str()); diff --git a/src/pcedit/pc.action.cpp b/src/pcedit/pc.action.cpp index abecb83f..e4d9d9b2 100644 --- a/src/pcedit/pc.action.cpp +++ b/src/pcedit/pc.action.cpp @@ -77,7 +77,6 @@ bool handle_action(const sf::Event & event) { univ.party[current_active_pc].items[i].variety != eItemType::NO_ITEM) { flash_rect(item_string_rects[i][2]); univ.party[current_active_pc].items[i].ident = true; - univ.party[current_active_pc].combine_things(); } }