thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA2: fix wrong spellid crash

Browse source
This commit is contained in:
Harishankar Kumar 2023-02-28 18:38:52 +05:30 • committed by Eugene Sandulenko
parent e557aa0c50
commit 85d2b9a8e6
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/saga2/magic.cpp
View file

@ -93,8 +93,15 @@ GameObject *GetOwner(GameObject *go) {
// This call looks up a spells object prototype. It can accept either // This call looks up a spells object prototype. It can accept either
// an object ID or a spell ID // an object ID or a spell ID
SkillProto *skillProtoFromID(int16 spellOrObjectID) { SkillProto *skillProtoFromID(int16 spellOrObjectID) {
SkillProto *sProto = (SkillProto *)GameObject::protoAddress(spellOrObjectID);
if (spellOrObjectID > MAX_SPELLS) if (spellOrObjectID > MAX_SPELLS)
return (SkillProto *)GameObject::protoAddress(spellOrObjectID); return sProto;
// Can be spellId, check if this the prototype returned by spellOrObjectID refers to a spell
int16 manaColor = spellBook[sProto->getSpellID()].getManaType();
int16 manaCost = spellBook[sProto->getSpellID()].getManaAmt();
if (manaColor >= ksManaIDRed && manaColor <= ksManaIDViolet && manaCost > 0) // A spell
return sProto;
if (spellOrObjectID >= kTotalSpellBookPages) if (spellOrObjectID >= kTotalSpellBookPages)
error("Wrong spellID: %d > %d", spellOrObjectID, kTotalSpellBookPages); error("Wrong spellID: %d > %d", spellOrObjectID, kTotalSpellBookPages);