simplify GetItemSpell

pionere · Sep 21, 2024 · 70892bb · 70892bb
1 parent 32463e7
commit 70892bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Source/debug.cpp b/Source/debug.cpp
@@ -1260,6 +1260,7 @@ void ValidateData()
 #endif
 
 	// spells
+	assert(spelldata[SPL_RESURRECT].sManaCost == 0); // required by GetItemSpell
 	assert(spelldata[SPL_TELEPORT].sSkillFlags & SDFLAG_TARGETED); // required by AddTeleport
 #define OBJ_TARGETING_CURSOR(x) ((x) == CURSOR_NONE || (x) == CURSOR_DISARM)
 	assert(OBJ_TARGETING_CURSOR(spelldata[SPL_DISARM].scCurs)); // required by TryIconCurs

diff --git a/Source/items.cpp b/Source/items.cpp
@@ -1352,8 +1352,8 @@ static int GetItemSpell()
 
 	ns = 0;
 	for (bs = 0; bs < NUM_SPELLS; bs++) {
-		if (spelldata[bs].sManaCost != 0 // TODO: use sSkillFlags ?
-		 && (IsMultiGame || bs != SPL_RESURRECT)) {
+		if (spelldata[bs].sManaCost != 0) { // TODO: use sSkillFlags ?
+			// assert(!IsMultiGame || bs != SPL_RESURRECT);
 			ss[ns] = bs;
 			ns++;
 		}