openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Revert "always combine_things() after identifying a held item"

Browse Source 
This reverts commit 364712ef9e.
This commit is contained in:
Nat Quayle Nelson
2025-01-08 19:41:35 -06:00
committed by Celtic Minstrel
parent 12a6850992
commit 6f0145c285
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/boe.party.cpp
View File

@@ -599,11 +599,9 @@ void do_mage_spell(short pc_num,eSpell spell_num,bool freebie) {
if(all_identified){ if(all_identified){
sstr << "already "; sstr << "already ";
}else{ }else{
for(cPlayer& pc : univ.party){ for(cPlayer& pc : univ.party)
for(cItem& item : pc.items) for(cItem& item : pc.items)
item.ident = true; item.ident = true;
pc.combine_things();
}
} }
sstr << "identified."; sstr << "identified.";
ASB(sstr.str()); ASB(sstr.str());

1
src/pcedit/pc.action.cpp
View File

@@ -77,7 +77,6 @@ bool handle_action(const sf::Event & event) {
univ.party[current_active_pc].items[i].variety != eItemType::NO_ITEM) { univ.party[current_active_pc].items[i].variety != eItemType::NO_ITEM) {
flash_rect(item_string_rects[i][2]); flash_rect(item_string_rects[i][2]);
univ.party[current_active_pc].items[i].ident = true; univ.party[current_active_pc].items[i].ident = true;
univ.party[current_active_pc].combine_things();
} }
} }