fix(zc): active shields interacting with light beams while inactive

ZQuestClassic · May 3, 2024 · 7e52830 · 7e52830
1 parent ae1c890
commit 7e52830
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/zc/hero.cpp b/src/zc/hero.cpp
@@ -23187,6 +23187,8 @@ void HeroClass::handleSpotlights()
 		std::map<int32_t, spot_t*> maps;
 		std::map<int32_t, std::map<dword, spot_t>> ffmaps;
 		int32_t shieldid = getCurrentShield(false);
+		if((itemsbuf[shieldid].flags & ITEM_FLAG9) && !usingActiveShield(shieldid))
+			shieldid = -1;
 		bool refl = shieldid > -1 && (itemsbuf[shieldid].misc2 & shLIGHTBEAM);
 		bool block = !refl && shieldid > -1 && (itemsbuf[shieldid].misc1 & shLIGHTBEAM);
 		heropos = COMBOPOS_B(x.getInt()+8,y.getInt()+8);