[Scummvm-git-logs] scummvm master -> e8240991b4b2d5c31a6bc8707d34789238da0090
dreammaster
noreply at scummvm.org
Tue May 23 04:37:27 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e8240991b4 MM: XEEN: Fix graphics for hits with elemental weapons
Commit: e8240991b4b2d5c31a6bc8707d34789238da0090
https://github.com/scummvm/scummvm/commit/e8240991b4b2d5c31a6bc8707d34789238da0090
Author: Alexander Izmailov (yarolig at gmail.com)
Date: 2023-05-22T21:37:01-07:00
Commit Message:
MM: XEEN: Fix graphics for hits with elemental weapons
Changed paths:
engines/mm/xeen/combat.cpp
diff --git a/engines/mm/xeen/combat.cpp b/engines/mm/xeen/combat.cpp
index 63ecc183683..13890b36363 100644
--- a/engines/mm/xeen/combat.cpp
+++ b/engines/mm/xeen/combat.cpp
@@ -1441,7 +1441,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
int monsterResist = getMonsterResistence(rangeType);
damage += monsterResist;
if (monsterResist > 0) {
- _pow[_attackDurationCtr]._elemFrame = XeenItem::getElementalCategory(_weaponElemMaterial);
+ _pow[_attackDurationCtr]._elemFrame = XeenItem::getElementalCategory(_weaponElemMaterial) + 1;
_pow[_attackDurationCtr]._elemScale = getDamageScale(monsterResist);
} else if (rangeType != RT_HIT) {
_pow[_attackDurationCtr]._elemFrame = 0;
More information about the Scummvm-git-logs
mailing list