[Scummvm-git-logs] scummvm master -> e96d32e07ff9cef1d1d08144ee81fad1357d9bc8

[dreammaster]

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:
e96d32e07f XEEN: Fix armor class calculations


Commit: e96d32e07ff9cef1d1d08144ee81fad1357d9bc8
    https://github.com/scummvm/scummvm/commit/e96d32e07ff9cef1d1d08144ee81fad1357d9bc8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-16T20:59:05-05:00

Commit Message:
XEEN: Fix armor class calculations

Changed paths:
    engines/xeen/character.cpp
    engines/xeen/combat.cpp


diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 7e36e54..7372c87 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -1192,13 +1192,6 @@ int Character::itemScan(int itemId) const {
 				if (mIndex == itemId)
 					result += Res.ELEMENTAL_RESISTENCES[item._material];
 			}
-
-			if (itemId == 9) {
-				result += Res.ARMOR_STRENGTHS[item._id];
-				if (item._material >= 37 && item._material <= 58) {
-					result += Res.METAL_LAC[item._material - 37];
-				}
-			}
 		}
 	}
 
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 34246b6..7b50ae8 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -929,9 +929,11 @@ void Combat::doMonsterTurn(int monsterId) {
 				} else {
 					int v = _vm->getRandomNumber(1, 20);
 					if (v == 1) {
+						// Critical Save
 						sound.playFX(6);
 					} else {
 						if (v == 20)
+							// Critical failure
 							doCharDamage(c, charNum, monsterId);
 						v += monsterData._hitChance / 4 + _vm->getRandomNumber(1,
 							monsterData._hitChance);