From 1a532a3c6ec47eec52b1c385a3075d16b632a2ab Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Fri, 27 Dec 2024 13:31:40 -0600
Subject: [PATCH] cancel identify spell if not needed

---
 src/game/boe.party.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/game/boe.party.cpp b/src/game/boe.party.cpp
index f3b32b0b..9cf088f7 100644
--- a/src/game/boe.party.cpp
+++ b/src/game/boe.party.cpp
@@ -578,11 +578,12 @@ void do_mage_spell(short pc_num,eSpell spell_num,bool freebie) {
 			increase_light(50);
 			break;
 			
-		case eSpell::IDENTIFY:
+		case eSpell::IDENTIFY:{
 			bool all_identified = true;
 			for(cPlayer& pc : univ.party)
 				for(cItem& item : pc.items)
-					all_identified &= item.ident;
+					if (item.variety != eItemType::NO_ITEM)
+						all_identified = all_identified && item.ident;
 
 			// Cancel without spending points if there are no unidentified items
 			if(!(freebie || all_identified))
@@ -596,18 +597,21 @@ void do_mage_spell(short pc_num,eSpell spell_num,bool freebie) {
 				shop_identify_cost = 0;
 				put_item_screen(stat_window);
 				break;
+			}else{
+				std::ostringstream sstr;
+				sstr << "All of your items are ";
+				if(all_identified){
+					sstr << "already ";
+				}else{
+					for(cPlayer& pc : univ.party)
+						for(cItem& item : pc.items)
+							item.ident = true;
+				}
+				sstr << "identified.";
+				ASB(sstr.str());
 			}
-			std::ostringstream sstr;
-			sstr << "All of your items are ";
-			if(all_identified){
-				sstr << "already ";
-			}
-			sstr << "identified.";
-			ASB(sstr.str(););
-			for(cPlayer& pc : univ.party)
-				for(cItem& item : pc.items)
-					item.ident = true;
 			break;
+		}
 
 		case eSpell::RECHARGE:
 			if(!freebie)