aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-02-09 19:17:19 -0500
committerPaul Gilbert2018-02-09 19:17:19 -0500
commit549b90481acf1f252ef05014df42372fc703f54b (patch)
treec170cb640bfd307a092e5b49ab325b3d88166c89
parent8d4230df21a2221d5faaa3402fa4dd1139122b13 (diff)
downloadscummvm-rg350-549b90481acf1f252ef05014df42372fc703f54b.tar.gz
scummvm-rg350-549b90481acf1f252ef05014df42372fc703f54b.tar.bz2
scummvm-rg350-549b90481acf1f252ef05014df42372fc703f54b.zip
XEEN: Fix MonsterStruct _accuracy to be _armorClass
Thanks to Leprosy57 in the GOG forums for pointing it out
-rw-r--r--engines/xeen/combat.cpp2
-rw-r--r--engines/xeen/dialogs_spells.cpp2
-rw-r--r--engines/xeen/map.cpp8
-rw-r--r--engines/xeen/map.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index c60a55a278..1d8b0db39b 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1670,7 +1670,7 @@ bool Combat::hitMonster(Character &c, RangeType rangeType) {
if (monster._damageType != DT_PHYSICAL)
chance += 20;
- return chance >= (monsterData._accuracy + 10);
+ return chance >= (monsterData._armorClass + 10);
}
void Combat::getWeaponDamage(Character &c, RangeType rangeType) {
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp
index ab0347e869..e00fa13e57 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs_spells.cpp
@@ -1019,7 +1019,7 @@ void IdentifyMonster::execute() {
monsterDesc[monIndex] = Common::String::format(Res.MONSTER_DETAILS,
monsterData._name.c_str(),
_vm->printK2(monster._hp).c_str(),
- monsterData._accuracy, monsterData._numberOfAttacks,
+ monsterData._armorClass, monsterData._numberOfAttacks,
Res.MONSTER_SPECIAL_ATTACKS[monsterData._specialAttack]
);
}
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 5aa2198619..aab806ff98 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -59,7 +59,7 @@ const char *const MUSIC_FILES2[6][7] = {
MonsterStruct::MonsterStruct() {
_experience = 0;
_hp = 0;
- _accuracy = 0;
+ _armorClass = 0;
_speed = 0;
_numberOfAttacks = 0;
_hatesClass = CLASS_KNIGHT;
@@ -88,7 +88,7 @@ MonsterStruct::MonsterStruct() {
_fx = 0;
}
-MonsterStruct::MonsterStruct(Common::String name, int experience, int hp, int accuracy,
+MonsterStruct::MonsterStruct(Common::String name, int experience, int hp, int armorClass,
int speed, int numberOfAttacks, CharacterClass hatesClass, int strikes,
int dmgPerStrike, DamageType attackType, SpecialAttack specialAttack,
int hitChance, int rangeAttack, MonsterType monsterType,
@@ -97,7 +97,7 @@ MonsterStruct::MonsterStruct(Common::String name, int experience, int hp, int ac
int phsyicalResistence, int field29, int gold, int gems, int itemDrop,
bool flying, int imageNumber, int loopAnimation, int animationEffect,
int fx, Common::String attackVoc):
- _name(name), _experience(experience), _hp(hp), _accuracy(accuracy),
+ _name(name), _experience(experience), _hp(hp), _armorClass(armorClass),
_speed(speed), _numberOfAttacks(numberOfAttacks), _hatesClass(hatesClass),
_strikes(strikes), _dmgPerStrike(dmgPerStrike), _attackType(attackType),
_specialAttack(specialAttack), _hitChance(hitChance), _rangeAttack(rangeAttack),
@@ -118,7 +118,7 @@ void MonsterStruct::synchronize(Common::SeekableReadStream &s) {
_experience = s.readUint32LE();
_hp = s.readUint16LE();
- _accuracy = s.readByte();
+ _armorClass = s.readByte();
_speed = s.readByte();
_numberOfAttacks = s.readByte();
_hatesClass = (CharacterClass)s.readByte();
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index 71af89e305..1f17954bac 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -52,7 +52,7 @@ public:
Common::String _name;
int _experience;
int _hp;
- int _accuracy;
+ int _armorClass;
int _speed;
int _numberOfAttacks;
int _hatesClass;