[Scummvm-git-logs] scummvm master -> 5a328ad1817d7257244fb4aaf862c9a408913c0c
bluegr
noreply at scummvm.org
Mon Sep 23 16:26:43 UTC 2024
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:
5a328ad181 JANITORIAL: MM: Fix typos
Commit: 5a328ad1817d7257244fb4aaf862c9a408913c0c
https://github.com/scummvm/scummvm/commit/5a328ad1817d7257244fb4aaf862c9a408913c0c
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-23T19:26:39+03:00
Commit Message:
JANITORIAL: MM: Fix typos
Changed paths:
engines/mm/mm1/data/character.h
engines/mm/mm1/data/spells_state.h
engines/mm/mm1/game/combat.cpp
engines/mm/mm1/game/spells_monsters.cpp
engines/mm/mm1/game/spells_party.cpp
engines/mm/xeen/character.cpp
engines/mm/xeen/character.h
engines/mm/xeen/combat.cpp
engines/mm/xeen/combat.h
engines/mm/xeen/dialogs/dialogs_char_info.cpp
engines/mm/xeen/dialogs/dialogs_create_char.cpp
engines/mm/xeen/dialogs/dialogs_info.cpp
engines/mm/xeen/interface.cpp
engines/mm/xeen/item.cpp
engines/mm/xeen/locations.cpp
engines/mm/xeen/map.cpp
engines/mm/xeen/map.h
engines/mm/xeen/party.cpp
engines/mm/xeen/party.h
engines/mm/xeen/resources.cpp
engines/mm/xeen/resources.h
engines/mm/xeen/scripts.cpp
engines/mm/xeen/spells.cpp
diff --git a/engines/mm/mm1/data/character.h b/engines/mm/mm1/data/character.h
index 176542402eb..3d5b22d8108 100644
--- a/engines/mm/mm1/data/character.h
+++ b/engines/mm/mm1/data/character.h
@@ -401,7 +401,7 @@ union Resistances {
Resistances();
/**
- * Handles save/loading resistences
+ * Handles save/loading resistances
*/
void synchronize(Common::Serializer &s);
diff --git a/engines/mm/mm1/data/spells_state.h b/engines/mm/mm1/data/spells_state.h
index 983c71d29ef..9a5203fc274 100644
--- a/engines/mm/mm1/data/spells_state.h
+++ b/engines/mm/mm1/data/spells_state.h
@@ -30,7 +30,7 @@ namespace MM1 {
struct SpellsState {
byte _mmVal1 = 0;
- byte _resistenceIndex = 0;
+ byte _resistanceIndex = 0;
byte _mmVal5 = 0;
byte _mmVal7 = 0;
@@ -47,7 +47,7 @@ struct SpellsState {
*/
void synchronize(Common::Serializer &s) {
s.syncAsByte(_mmVal1);
- s.syncAsByte(_resistenceIndex);
+ s.syncAsByte(_resistanceIndex);
s.syncAsByte(_mmVal5);
s.syncAsByte(_mmVal7);
s.syncAsByte(_resistanceTypeOrTargetCount);
diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 03a6d796c4c..b43e5379d33 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -947,7 +947,7 @@ void Combat::iterateMonsters1Inner() {
}
}
- byte idx = g_globals->_spellsState._resistenceIndex;
+ byte idx = g_globals->_spellsState._resistanceIndex;
if (affects && idx) {
if (--idx >= 8)
idx = 0;
@@ -1027,7 +1027,7 @@ void Combat::iterateMonsters2Inner() {
_damage >>= 1;
}
- byte idx = g_globals->_spellsState._resistenceIndex;
+ byte idx = g_globals->_spellsState._resistanceIndex;
if (idx) {
if (--idx >= 8)
idx = 0;
@@ -1168,7 +1168,7 @@ void Combat::summonLightning() {
ss._damage = g_globals->_currCharacter->_level * 2 + 4;
ss._mmVal1++;
- ss._resistenceIndex++;
+ ss._resistanceIndex++;
ss._resistanceTypeOrTargetCount = RESISTANCE_ELECTRICITY;
handlePartyDamage();
@@ -1186,7 +1186,7 @@ void Combat::summonLightning() {
void Combat::summonLightning2() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1 = 1;
- ss._resistenceIndex = 2;
+ ss._resistanceIndex = 2;
ss._resistanceTypeOrTargetCount = RESISTANCE_ELECTRICITY;
ss._damage = getRandomNumber(29) + 3;
@@ -1196,7 +1196,7 @@ void Combat::summonLightning2() {
void Combat::fireball2() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1 = 1;
- ss._resistenceIndex = 1;
+ ss._resistanceIndex = 1;
ss._resistanceTypeOrTargetCount = 5;
ss._damage = 0;
@@ -1216,7 +1216,7 @@ void Combat::paralyze() {
g_globals->_combat->resetDestMonster();
ss._mmVal1++;
- ss._resistenceIndex = 6;
+ ss._resistanceIndex = 6;
ss._resistanceTypeOrTargetCount = _attackersCount;
ss._damage = BAD_CONDITION;
@@ -1326,7 +1326,7 @@ void Combat::fireball() {
ss._damage = g_globals->_currCharacter->_level * 2 + 4;
ss._mmVal1++;
- ss._resistenceIndex++;
+ ss._resistanceIndex++;
ss._resistanceTypeOrTargetCount++;
handlePartyDamage();
@@ -1345,7 +1345,7 @@ void Combat::lightningBolt() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
ss._resistanceTypeOrTargetCount = 3;
- ss._resistenceIndex = 2;
+ ss._resistanceIndex = 2;
levelAdjust();
}
@@ -1382,7 +1382,7 @@ bool Combat::web() {
return false;
ss._mmVal1++;
- ss._resistenceIndex = 0;
+ ss._resistanceIndex = 0;
ss._resistanceTypeOrTargetCount = 5;
ss._damage = UNCONSCIOUS;
@@ -1400,7 +1400,7 @@ bool Combat::acidRain() {
monsterIndexOf();
ss._mmVal1 = 1;
- ss._resistenceIndex = 3;
+ ss._resistanceIndex = 3;
ss._resistanceTypeOrTargetCount = 15;
ss._damage = 0;
diff --git a/engines/mm/mm1/game/spells_monsters.cpp b/engines/mm/mm1/game/spells_monsters.cpp
index 27b47ef1499..3c5e6b31a06 100644
--- a/engines/mm/mm1/game/spells_monsters.cpp
+++ b/engines/mm/mm1/game/spells_monsters.cpp
@@ -68,7 +68,7 @@ SpellsMonsters::SpellsMonsters() {
void SpellsMonsters::castMonsterSpell(const Common::String &monsterName, int spellNum) {
g_globals->_spellsState._mmVal1 = 0;
- g_globals->_spellsState._resistenceIndex = 0;
+ g_globals->_spellsState._resistanceIndex = 0;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_MAGIC;
g_globals->_spellsState._damage = 0;
@@ -100,7 +100,7 @@ void SpellsMonsters::spell03_fire() {
add(Common::String::format("%s %s",
STRING["monster_spells.breathes"].c_str(),
STRING["monster_spells.fire"].c_str()));
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_FIRE;
int count = _remainingMonsters[getMonsterIndex()]->_level;
@@ -113,7 +113,7 @@ void SpellsMonsters::spell04_blindness() {
if (casts()) {
add(STRING["monster_spells.blindness"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = 2;
handlePartyEffects();
@@ -122,7 +122,7 @@ void SpellsMonsters::spell04_blindness() {
void SpellsMonsters::spell05_sprayPoison() {
add(STRING["monster_spells.sprays_poison"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_POISON;
g_globals->_spellsState._damage = POISONED;
handlePartyEffects();
@@ -130,7 +130,7 @@ void SpellsMonsters::spell05_sprayPoison() {
void SpellsMonsters::spell06_sprayAcid() {
add(STRING["monster_spells.sprays_acid"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ACID;
g_globals->_spellsState._damage = getRandomNumber((int)POISONED);
add(':');
@@ -142,7 +142,7 @@ void SpellsMonsters::spell07_sleep() {
if (casts()) {
add(STRING["monster_spells.sleep"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_PSYCHIC;
g_globals->_spellsState._damage = ASLEEP;
handlePartyEffects();
@@ -153,7 +153,7 @@ void SpellsMonsters::spell08_paralyze() {
if (casts()) {
add(STRING["monster_spells.paralyze"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_FEAR;
g_globals->_spellsState._damage = PARALYZED;
@@ -177,7 +177,7 @@ void SpellsMonsters::spell10_lightningBolt() {
if (casts()) {
add(STRING["monster_spells.lightning_bolt"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ELECTRICITY;
g_globals->_spellsState._damage = getRandomNumber(37) + 5;
damageRandomChar();
@@ -188,7 +188,7 @@ void SpellsMonsters::spell11_strangeGas() {
add(Common::String::format("%s %s",
STRING["monster_spells.breathes"].c_str(),
STRING["monster_spells.strange_gas"].c_str()));
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_POISON;
g_globals->_spellsState._damage = BAD_CONDITION | STONE;
@@ -197,7 +197,7 @@ void SpellsMonsters::spell11_strangeGas() {
void SpellsMonsters::spell12_explode() {
add(STRING["monster_spells.explode"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_POISON;
g_globals->_spellsState._damage = getRandomNumber(
_remainingMonsters[getMonsterIndex()]->_level);
@@ -213,7 +213,7 @@ void SpellsMonsters::spell13_fireball() {
if (casts()) {
add(STRING["monster_spells.fireball"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_FIRE;
// This whole condition choice makes no sense
@@ -230,7 +230,7 @@ void SpellsMonsters::spell14_fireBreath() {
add(Common::String::format("%s %s",
STRING["monster_spells.breathes"].c_str(),
STRING["monster_spells.fire"].c_str()));
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_FIRE;
// This whole condition choice makes no sense
@@ -244,7 +244,7 @@ void SpellsMonsters::spell14_fireBreath() {
void SpellsMonsters::spell15_gazes() {
add(STRING["monster_spells.gazes"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = BAD_CONDITION | STONE;
chooseCharacter();
@@ -254,7 +254,7 @@ void SpellsMonsters::spell15_gazes() {
void SpellsMonsters::spell16_acidArrow() {
add(STRING["monster_spells.acid_arrow"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ACID;
g_globals->_spellsState._damage = getRandomNumber(31) + 9;
@@ -263,7 +263,7 @@ void SpellsMonsters::spell16_acidArrow() {
void SpellsMonsters::spell17_elements() {
add(STRING["monster_spells.call_elements"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = getRandomNumber(21) + 39;
damageRandomChar();
@@ -273,7 +273,7 @@ void SpellsMonsters::spell18_coldBeam() {
if (casts()) {
add(STRING["monster_spells.cold_beam"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_COLD;
g_globals->_spellsState._damage = getRandomNumber(41) + 9;
@@ -308,7 +308,7 @@ void SpellsMonsters::spell21_fingerOfDeath() {
if (casts()) {
add(STRING["monster_spells.finger_of_death"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = BAD_CONDITION | DEAD;
chooseCharacter();
@@ -320,7 +320,7 @@ void SpellsMonsters::spell22_sunRay() {
if (casts()) {
add(STRING["monster_spells.sun_ray"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = getRandomNumber(51) + 49;
damageRandomChar();
@@ -331,7 +331,7 @@ void SpellsMonsters::spell23_disintegration() {
if (casts()) {
add(STRING["monster_spells.disintegration"]);
++g_globals->_spellsState._mmVal1;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = ERADICATED;
chooseCharacter();
@@ -351,7 +351,7 @@ void SpellsMonsters::spell25_poison() {
STRING["monster_spells.poison"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_POISON;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -363,7 +363,7 @@ void SpellsMonsters::spell26_lightning() {
STRING["monster_spells.lightning"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ELECTRICITY;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -375,7 +375,7 @@ void SpellsMonsters::spell27_frost() {
STRING["monster_spells.frost"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_COLD;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -387,7 +387,7 @@ void SpellsMonsters::spell28_spikes() {
STRING["monster_spells.spikes"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ELECTRICITY;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -399,7 +399,7 @@ void SpellsMonsters::spell29_acid() {
STRING["monster_spells.acid"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_ACID;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -411,7 +411,7 @@ void SpellsMonsters::spell30_fire() {
STRING["monster_spells.fire"].c_str()));
g_globals->_spellsState._resistanceTypeOrTargetCount = RESISTANCE_FIRE;
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -420,7 +420,7 @@ void SpellsMonsters::spell30_fire() {
void SpellsMonsters::spell31_energy() {
add(STRING["monster_spells.energy"]);
g_globals->_spellsState._damage = _remainingMonsters[getMonsterIndex()]->_hp;
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
add(':');
handlePartyDamage();
@@ -428,7 +428,7 @@ void SpellsMonsters::spell31_energy() {
void SpellsMonsters::spell32_swarm() {
add(STRING["monster_spells.swarm"]);
- ++g_globals->_spellsState._resistenceIndex;
+ ++g_globals->_spellsState._resistanceIndex;
g_globals->_spellsState._damage = getRandomNumber(12);
add(':');
@@ -512,7 +512,7 @@ bool SpellsMonsters::charAffected() {
}
bool SpellsMonsters::isEffective() {
- if (g_globals->_spellsState._resistenceIndex) {
+ if (g_globals->_spellsState._resistanceIndex) {
proc9();
if (g_globals->_spellsState._mmVal7) {
diff --git a/engines/mm/mm1/game/spells_party.cpp b/engines/mm/mm1/game/spells_party.cpp
index 8164c15b180..c1130122b9f 100644
--- a/engines/mm/mm1/game/spells_party.cpp
+++ b/engines/mm/mm1/game/spells_party.cpp
@@ -164,7 +164,7 @@ SpellResult SpellsParty::cleric12_bless() {
SpellResult SpellsParty::cleric13_blind() {
SpellsState &s = g_globals->_spellsState;
s._mmVal1++;
- s._resistenceIndex = 7;
+ s._resistanceIndex = 7;
s._damage = BLINDED;
s._resistanceTypeOrTargetCount = static_cast<Resistance>((int)s._resistanceTypeOrTargetCount + 1);
@@ -228,7 +228,7 @@ SpellResult SpellsParty::cleric23_pain() {
ss._damage = getRandomNumber(6) + getRandomNumber(6);
ss._mmVal1++;
ss._resistanceTypeOrTargetCount++;
- ss._resistenceIndex = 6;
+ ss._resistanceIndex = 6;
g_globals->_combat->iterateMonsters2();
return SR_SUCCESS_SILENT;
@@ -255,7 +255,7 @@ SpellResult SpellsParty::cleric26_protectionFromPoison() {
SpellResult SpellsParty::cleric27_silence() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex = 7;
+ ss._resistanceIndex = 7;
ss._damage = SILENCED;
ss._resistanceTypeOrTargetCount++;
@@ -266,7 +266,7 @@ SpellResult SpellsParty::cleric27_silence() {
SpellResult SpellsParty::cleric28_suggestion() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex = 6;
+ ss._resistanceIndex = 6;
ss._damage = PARALYZED;
ss._resistanceTypeOrTargetCount++;
@@ -310,7 +310,7 @@ SpellResult SpellsParty::cleric35_produceFlame() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
ss._resistanceTypeOrTargetCount++;
- ss._resistenceIndex = 4;
+ ss._resistanceIndex = 4;
ss._damage = getRandomNumber(6) +
getRandomNumber(6) + getRandomNumber(6);
g_globals->_combat->iterateMonsters2();
@@ -320,7 +320,7 @@ SpellResult SpellsParty::cleric35_produceFlame() {
SpellResult SpellsParty::cleric36_produceFrost() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex++;
+ ss._resistanceIndex++;
ss._damage = getRandomNumber(6) +
getRandomNumber(6) + getRandomNumber(6);
g_globals->_combat->iterateMonsters2();
@@ -407,7 +407,7 @@ SpellResult SpellsParty::cleric51_deadlySwarm() {
SpellsState &ss = g_globals->_spellsState;
g_globals->_combat->resetDestMonster();
ss._mmVal1++;
- ss._resistenceIndex = 0;
+ ss._resistanceIndex = 0;
ss._damage = getRandomNumber(10) + getRandomNumber(10);
g_globals->_combat->iterateMonsters2();
@@ -481,7 +481,7 @@ SpellResult SpellsParty::cleric61_moonRay() {
g_globals->_combat->resetDestMonster();
ss._damage = hp;
ss._mmVal1++;
- ss._resistenceIndex = 5;
+ ss._resistanceIndex = 5;
g_globals->_combat->iterateMonsters2();
return SR_SUCCESS_SILENT;
@@ -619,7 +619,7 @@ SpellResult SpellsParty::cleric75_sunRay() {
SpellsState &ss = g_globals->_spellsState;
ss._damage = getRandomNumber(51) + 49;
ss._mmVal1++;
- ss._resistenceIndex++;
+ ss._resistanceIndex++;
ss._resistanceTypeOrTargetCount = RESISTANCE_FIRE;
g_globals->_combat->iterateMonsters2();
@@ -638,7 +638,7 @@ SpellResult SpellsParty::wizard13_energyBlast() {
damage += getRandomNumber(4);
ss._damage = MIN(damage, 255);
- ss._resistenceIndex = 5;
+ ss._resistanceIndex = 5;
ss._resistanceTypeOrTargetCount++;
g_globals->_combat->iterateMonsters2();
@@ -649,7 +649,7 @@ SpellResult SpellsParty::wizard14_flameArrow() {
SpellsState &ss = g_globals->_spellsState;
ss._damage = getRandomNumber(6);
ss._mmVal1++;
- ss._resistenceIndex = 1;
+ ss._resistanceIndex = 1;
ss._resistanceTypeOrTargetCount++;
g_globals->_combat->iterateMonsters2();
@@ -669,7 +669,7 @@ SpellResult SpellsParty::wizard17_location() {
SpellResult SpellsParty::wizard18_sleep() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex = 8;
+ ss._resistanceIndex = 8;
ss._resistanceTypeOrTargetCount = RESISTANCE_FEAR;
ss._damage = 16;
@@ -682,7 +682,7 @@ SpellResult SpellsParty::wizard21_electricArrow() {
ss._damage = getRandomNumber(6) + getRandomNumber(6);
ss._mmVal1++;
ss._resistanceTypeOrTargetCount++;
- ss._resistenceIndex = 2;
+ ss._resistanceIndex = 2;
g_globals->_combat->iterateMonsters2();
return SR_SUCCESS_SILENT;
@@ -745,7 +745,7 @@ SpellResult SpellsParty::wizard27_quickness() {
SpellResult SpellsParty::wizard28_scare() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex = 7;
+ ss._resistanceIndex = 7;
ss._resistanceTypeOrTargetCount++;
ss._damage = 1;
@@ -796,7 +796,7 @@ SpellResult SpellsParty::wizard41_acidArrow() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
ss._resistanceTypeOrTargetCount++;
- ss._resistenceIndex = 3;
+ ss._resistanceIndex = 3;
ss._damage += getRandomNumber(10) +
getRandomNumber(10) + getRandomNumber(10);
@@ -808,7 +808,7 @@ SpellResult SpellsParty::wizard42_coldBeam() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
ss._resistanceTypeOrTargetCount++;
- ss._resistenceIndex = 4;
+ ss._resistanceIndex = 4;
ss._damage = getRandomNumber(10) + getRandomNumber(10) +
getRandomNumber(10) + getRandomNumber(10);
@@ -820,7 +820,7 @@ SpellResult SpellsParty::wizard42_coldBeam() {
SpellResult SpellsParty::wizard43_feebleMind() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1++;
- ss._resistenceIndex = 0;
+ ss._resistanceIndex = 0;
ss._resistanceTypeOrTargetCount++;
ss._damage = 8;
@@ -831,7 +831,7 @@ SpellResult SpellsParty::wizard43_feebleMind() {
SpellResult SpellsParty::wizard44_freeze() {
SpellsState &ss = g_globals->_spellsState;
ss._mmVal1 = 0;
- ss._resistenceIndex = 6;
+ ss._resistanceIndex = 6;
ss._resistanceTypeOrTargetCount++;
ss._damage = 128;
@@ -894,7 +894,7 @@ SpellResult SpellsParty::wizard61_dancingSword() {
g_globals->_combat->resetDestMonster();
ss._mmVal1 = 0;
- ss._resistenceIndex = 0;
+ ss._resistanceIndex = 0;
ss._damage = getRandomNumber(30);
g_globals->_combat->iterateMonsters2();
@@ -944,7 +944,7 @@ SpellResult SpellsParty::wizard73_meteorShower() {
g_globals->_combat->resetDestMonster();
ss._mmVal1++;
- ss._resistenceIndex = 5;
+ ss._resistanceIndex = 5;
ss._damage = MIN((int)getRandomNumber(120) +
(int)g_globals->_currCharacter->_level._current, 120);
diff --git a/engines/mm/xeen/character.cpp b/engines/mm/xeen/character.cpp
index 880c765218e..632b9343ec8 100644
--- a/engines/mm/xeen/character.cpp
+++ b/engines/mm/xeen/character.cpp
@@ -94,12 +94,12 @@ void Character::clear() {
_speed._permanent = _speed._temporary = 0;
_accuracy._permanent = _accuracy._temporary = 0;
_luck._permanent = _luck._temporary = 0;
- _fireResistence._permanent = _fireResistence._temporary = 0;
- _coldResistence._permanent = _coldResistence._temporary = 0;
- _electricityResistence._permanent = _electricityResistence._temporary = 0;
- _poisonResistence._permanent = _poisonResistence._temporary = 0;
- _energyResistence._permanent = _energyResistence._temporary = 0;
- _magicResistence._permanent = _magicResistence._temporary = 0;
+ _fireResistance._permanent = _fireResistance._temporary = 0;
+ _coldResistance._permanent = _coldResistance._temporary = 0;
+ _electricityResistance._permanent = _electricityResistance._temporary = 0;
+ _poisonResistance._permanent = _poisonResistance._temporary = 0;
+ _energyResistance._permanent = _energyResistance._temporary = 0;
+ _magicResistance._permanent = _magicResistance._temporary = 0;
_weapons.clear();
_armor.clear();
_accessories.clear();
@@ -140,12 +140,12 @@ Character &Character::operator=(const Character &src) {
_accessories = src._accessories;
_misc = src._misc;
_lloydSide = src._lloydSide;
- _fireResistence = src._fireResistence;
- _coldResistence = src._coldResistence;
- _electricityResistence = src._electricityResistence;
- _poisonResistence = src._poisonResistence;
- _energyResistence = src._energyResistence;
- _magicResistence = src._magicResistence;
+ _fireResistance = src._fireResistance;
+ _coldResistance = src._coldResistance;
+ _electricityResistance = src._electricityResistance;
+ _poisonResistance = src._poisonResistance;
+ _energyResistance = src._energyResistance;
+ _magicResistance = src._magicResistance;
Common::copy(&src._conditions[0], &src._conditions[16], &_conditions[0]);
_townUnknown = src._townUnknown;
_savedMazeId = src._savedMazeId;
@@ -228,12 +228,12 @@ void Character::synchronize(Common::Serializer &s) {
_misc[i].synchronize(s);
s.syncAsByte(_lloydSide);
- _fireResistence.synchronize(s);
- _coldResistence.synchronize(s);
- _electricityResistence.synchronize(s);
- _poisonResistence.synchronize(s);
- _energyResistence.synchronize(s);
- _magicResistence.synchronize(s);
+ _fireResistance.synchronize(s);
+ _coldResistance.synchronize(s);
+ _electricityResistance.synchronize(s);
+ _poisonResistance.synchronize(s);
+ _energyResistance.synchronize(s);
+ _magicResistance.synchronize(s);
for (int i = 0; i < 16; ++i)
s.syncAsByte(_conditions[i]);
@@ -437,22 +437,22 @@ bool Character::charSavingThrow(DamageType attackType) const {
} else {
switch (attackType) {
case DT_MAGICAL:
- v = _magicResistence._permanent + _magicResistence._temporary + itemScan(16);
+ v = _magicResistance._permanent + _magicResistance._temporary + itemScan(16);
break;
case DT_FIRE:
- v = _fireResistence._permanent + _fireResistence._temporary + itemScan(11);
+ v = _fireResistance._permanent + _fireResistance._temporary + itemScan(11);
break;
case DT_ELECTRICAL:
- v = _electricityResistence._permanent + _electricityResistence._temporary + itemScan(12);
+ v = _electricityResistance._permanent + _electricityResistance._temporary + itemScan(12);
break;
case DT_COLD:
- v = _coldResistence._permanent + _coldResistence._temporary + itemScan(13);
+ v = _coldResistance._permanent + _coldResistance._temporary + itemScan(13);
break;
case DT_POISON:
- v = _poisonResistence._permanent + _poisonResistence._temporary + itemScan(14);
+ v = _poisonResistance._permanent + _poisonResistance._temporary + itemScan(14);
break;
case DT_ENERGY:
- v = _energyResistence._permanent + _energyResistence._temporary + itemScan(15);
+ v = _energyResistance._permanent + _energyResistance._temporary + itemScan(15);
break;
default:
v = 0;
@@ -590,7 +590,7 @@ int Character::itemScan(int itemId) const {
int mIndex = item.getElementalCategory() + 11;
if (mIndex == itemId) {
- result += Res.ELEMENTAL_RESISTENCES[item._material];
+ result += Res.ELEMENTAL_RESISTANCES[item._material];
}
}
@@ -622,7 +622,7 @@ int Character::itemScan(int itemId) const {
int mIndex = item.getElementalCategory() + 11;
if (mIndex == itemId)
- result += Res.ELEMENTAL_RESISTENCES[item._material];
+ result += Res.ELEMENTAL_RESISTANCES[item._material];
}
}
}
@@ -713,7 +713,7 @@ void Character::setValue(int id, uint value) {
break;
case 17:
// Set party poison resistance
- party._poisonResistence = value;
+ party._poisonResistance = value;
break;
case 18:
// Set condition
@@ -784,40 +784,40 @@ void Character::setValue(int id, uint value) {
_luck._permanent = value;
break;
case 52:
- _fireResistence._permanent = value;
+ _fireResistance._permanent = value;
break;
case 53:
- _electricityResistence._permanent = value;
+ _electricityResistance._permanent = value;
break;
case 54:
- _coldResistence._permanent = value;
+ _coldResistance._permanent = value;
break;
case 55:
- _poisonResistence._permanent = value;
+ _poisonResistance._permanent = value;
break;
case 56:
- _energyResistence._permanent = value;
+ _energyResistance._permanent = value;
break;
case 57:
- _magicResistence._permanent = value;
+ _magicResistance._permanent = value;
break;
case 58:
- _fireResistence._temporary = value;
+ _fireResistance._temporary = value;
break;
case 59:
- _electricityResistence._temporary = value;
+ _electricityResistance._temporary = value;
break;
case 60:
- _coldResistence._temporary = value;
+ _coldResistance._temporary = value;
break;
case 61:
- _poisonResistence._temporary = value;
+ _poisonResistance._temporary = value;
break;
case 62:
- _energyResistence._temporary = value;
+ _energyResistance._temporary = value;
break;
case 63:
- _magicResistence._temporary = value;
+ _magicResistance._temporary = value;
break;
case 64:
_level._permanent = value;
@@ -833,21 +833,21 @@ void Character::setValue(int id, uint value) {
party._lightCount = value;
break;
case 71:
- party._fireResistence = value;
+ party._fireResistance = value;
break;
case 72:
- party._electricityResistence = value;
+ party._electricityResistance = value;
break;
case 73:
- party._coldResistence = value;
+ party._coldResistance = value;
break;
case 74:
party._walkOnWaterActive = value != 0;
- party._poisonResistence = value;
+ party._poisonResistance = value;
party._wizardEyeActive = value != 0;
- party._coldResistence = value;
- party._electricityResistence = value;
- party._fireResistence = value;
+ party._coldResistance = value;
+ party._electricityResistance = value;
+ party._fireResistance = value;
party._lightCount = value;
party._levitateCount = value;
break;
diff --git a/engines/mm/xeen/character.h b/engines/mm/xeen/character.h
index 5a7a8af2be8..5389172b409 100644
--- a/engines/mm/xeen/character.h
+++ b/engines/mm/xeen/character.h
@@ -140,12 +140,12 @@ public:
MiscItems _misc;
InventoryItemsGroup _items;
int _lloydSide;
- AttributePair _fireResistence;
- AttributePair _coldResistence;
- AttributePair _electricityResistence;
- AttributePair _poisonResistence;
- AttributePair _energyResistence;
- AttributePair _magicResistence;
+ AttributePair _fireResistance;
+ AttributePair _coldResistance;
+ AttributePair _electricityResistance;
+ AttributePair _poisonResistance;
+ AttributePair _energyResistance;
+ AttributePair _magicResistance;
int _conditions[16];
int _townUnknown;
int _savedMazeId;
diff --git a/engines/mm/xeen/combat.cpp b/engines/mm/xeen/combat.cpp
index 96d0fa425d3..cc4702de7de 100644
--- a/engines/mm/xeen/combat.cpp
+++ b/engines/mm/xeen/combat.cpp
@@ -206,22 +206,22 @@ void Combat::giveCharDamage(int damage, DamageType attackType, int charIndex) {
fx = 27;
break;
case DT_FIRE:
- damage -= party._fireResistence;
+ damage -= party._fireResistance;
frame = 1;
fx = 22;
break;
case DT_ELECTRICAL:
- damage -= party._electricityResistence;
+ damage -= party._electricityResistance;
frame = 2;
fx = 23;
break;
case DT_COLD:
- damage -= party._coldResistence;
+ damage -= party._coldResistance;
frame = 3;
fx = 24;
break;
case DT_POISON:
- damage -= party._poisonResistence;
+ damage -= party._poisonResistance;
frame = 4;
fx = 26;
break;
@@ -315,22 +315,22 @@ void Combat::doCharDamage(Character &c, int charNum, int monsterDataIndex) {
fx = 27;
break;
case DT_FIRE:
- damage -= party._fireResistence;
+ damage -= party._fireResistance;
frame = 1;
fx = 22;
break;
case DT_ELECTRICAL:
- damage -= party._electricityResistence;
+ damage -= party._electricityResistance;
frame = 2;
fx = 23;
break;
case DT_COLD:
- damage -= party._coldResistence;
+ damage -= party._coldResistance;
frame = 3;
fx = 24;
break;
case DT_POISON:
- damage -= party._poisonResistence;
+ damage -= party._poisonResistance;
frame = 4;
fx = 26;
break;
@@ -1209,7 +1209,7 @@ void Combat::attack(Character &c, RangeType rangeType) {
if (rangeType != RT_SINGLE) {
if (_shootType != ST_1 || _damageType == DT_MAGIC_ARROW) {
- if (!monsterData._magicResistence || monsterData._magicResistence <=
+ if (!monsterData._magicResistance || monsterData._magicResistance <=
_vm->getRandomNumber(1, 100 + _oldCharacter->getCurrentLevel())) {
if (_monsterDamage != 0) {
attack2(damage, rangeType);
@@ -1420,13 +1420,13 @@ void Combat::attack2(int damage, RangeType rangeType) {
monster._damageType = DT_PHYSICAL;
if ((rangeType == RT_SINGLE || _damageType == DT_PHYSICAL) && _attackWeaponId < XEEN_SLAYER_SWORD) {
- if (monsterData._phsyicalResistence != 0) {
- if (monsterData._phsyicalResistence == 100) {
+ if (monsterData._phsyicalResistance != 0) {
+ if (monsterData._phsyicalResistance == 100) {
// Completely immune to the damage
damage = 0;
} else {
// Reduce the damage based on physical resistance
- damage = damage * (100 - monsterData._phsyicalResistence) / 100;
+ damage = damage * (100 - monsterData._phsyicalResistance) / 100;
}
}
}
@@ -1438,7 +1438,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
monster._postAttackDelay = 5;
}
- int monsterResist = getMonsterResistence(rangeType);
+ int monsterResist = getMonsterResistance(rangeType);
damage += monsterResist;
if (monsterResist > 0) {
_pow[_attackDurationCtr]._elemFrame = XeenItem::getElementalCategory(_weaponElemMaterial) + 1;
@@ -1741,35 +1741,35 @@ int Combat::getDamageScale(int v) {
return 0x8000;
}
-int Combat::getMonsterResistence(RangeType rangeType) {
+int Combat::getMonsterResistance(RangeType rangeType) {
Map &map = *_vm->_map;
assert(_monster2Attack != -1);
MazeMonster &monster = map._mobData._monsters[_monster2Attack];
MonsterStruct &monsterData = *monster._monsterData;
- int resistence = 0, damage = 0;
+ int resistance = 0, damage = 0;
if (rangeType != RT_SINGLE && rangeType != RT_HIT) {
switch (_damageType) {
case DT_PHYSICAL:
- resistence = monsterData._phsyicalResistence;
+ resistance = monsterData._phsyicalResistance;
break;
case DT_MAGICAL:
- resistence = monsterData._magicResistence;
+ resistance = monsterData._magicResistance;
break;
case DT_FIRE:
- resistence = monsterData._fireResistence;
+ resistance = monsterData._fireResistance;
break;
case DT_ELECTRICAL:
- resistence = monsterData._electricityResistence;
+ resistance = monsterData._electricityResistance;
break;
case DT_COLD:
- resistence = monsterData._coldResistence;
+ resistance = monsterData._coldResistance;
break;
case DT_POISON:
- resistence = monsterData._poisonResistence;
+ resistance = monsterData._poisonResistance;
break;
case DT_ENERGY:
- resistence = monsterData._energyResistence;
+ resistance = monsterData._energyResistance;
break;
default:
break;
@@ -1780,25 +1780,25 @@ int Combat::getMonsterResistence(RangeType rangeType) {
if (material != 0) {
if (material < 9)
- resistence = monsterData._fireResistence;
+ resistance = monsterData._fireResistance;
else if (material < 16)
- resistence = monsterData._electricityResistence;
+ resistance = monsterData._electricityResistance;
else if (material < 21)
- resistence = monsterData._coldResistence;
+ resistance = monsterData._coldResistance;
else if (material < 26)
- resistence = monsterData._poisonResistence;
+ resistance = monsterData._poisonResistance;
else if (material < 34)
- resistence = monsterData._energyResistence;
+ resistance = monsterData._energyResistance;
else
- resistence = monsterData._magicResistence;
+ resistance = monsterData._magicResistance;
}
}
- if (resistence != 0) {
- if (resistence == 100)
+ if (resistance != 0) {
+ if (resistance == 100)
return 0;
else
- return ((100 - resistence) * damage) / 100;
+ return ((100 - resistance) * damage) / 100;
}
return damage;
diff --git a/engines/mm/xeen/combat.h b/engines/mm/xeen/combat.h
index 96a0333d87b..34f9563fa9b 100644
--- a/engines/mm/xeen/combat.h
+++ b/engines/mm/xeen/combat.h
@@ -143,7 +143,7 @@ private:
/**
* Gets the current monster's damage resistance to the currently set damage type
*/
- int getMonsterResistence(RangeType rangeType);
+ int getMonsterResistance(RangeType rangeType);
/**
* Distribute experience between active party members
diff --git a/engines/mm/xeen/dialogs/dialogs_char_info.cpp b/engines/mm/xeen/dialogs/dialogs_char_info.cpp
index 2ed1e867516..c30343794ef 100644
--- a/engines/mm/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/mm/xeen/dialogs/dialogs_char_info.cpp
@@ -293,12 +293,12 @@ Common::String CharacterInfo::loadCharacterDetails(const Character &c) {
int foodVal = party._food / party._activeParty.size() / 3;
int totalResist =
- c._fireResistence._permanent + c.itemScan(11) + c._fireResistence._temporary +
- c._coldResistence._permanent + c.itemScan(13) + c._coldResistence._temporary +
- c._electricityResistence._permanent + c.itemScan(12) + c._electricityResistence._temporary +
- c._poisonResistence._permanent + c.itemScan(14) + c._poisonResistence._temporary +
- c._energyResistence._permanent + c.itemScan(15) + c._energyResistence._temporary +
- c._magicResistence._permanent + c.itemScan(16) + c._magicResistence._temporary;
+ c._fireResistance._permanent + c.itemScan(11) + c._fireResistance._temporary +
+ c._coldResistance._permanent + c.itemScan(13) + c._coldResistance._temporary +
+ c._electricityResistance._permanent + c.itemScan(12) + c._electricityResistance._temporary +
+ c._poisonResistance._permanent + c.itemScan(14) + c._poisonResistance._temporary +
+ c._energyResistance._permanent + c.itemScan(15) + c._energyResistance._temporary +
+ c._magicResistance._permanent + c.itemScan(16) + c._magicResistance._temporary;
const char **_tmpConditions = c._sex == FEMALE ? (const char **)Res.CONDITION_NAMES_F : (const char **)Res.CONDITION_NAMES_M;
return Common::String::format(Res.CHARACTER_DETAILS,
@@ -462,14 +462,14 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) {
break;
case 12:
- // Resistences
- msg = Common::String::format(Res.RESISTENCES_TEXT, Res.STAT_NAMES[attrib],
- c._fireResistence._permanent + c.itemScan(11) + c._fireResistence._temporary,
- c._coldResistence._permanent + c.itemScan(13) + c._coldResistence._temporary,
- c._electricityResistence._permanent + c.itemScan(12) + c._electricityResistence._temporary,
- c._poisonResistence._permanent + c.itemScan(14) + c._poisonResistence._temporary,
- c._energyResistence._permanent + c.itemScan(15) + c._energyResistence._temporary,
- c._magicResistence._permanent + c.itemScan(16) + c._magicResistence._temporary);
+ // Resistances
+ msg = Common::String::format(Res.RESISTANCES_TEXT, Res.STAT_NAMES[attrib],
+ c._fireResistance._permanent + c.itemScan(11) + c._fireResistance._temporary,
+ c._coldResistance._permanent + c.itemScan(13) + c._coldResistance._temporary,
+ c._electricityResistance._permanent + c.itemScan(12) + c._electricityResistance._temporary,
+ c._poisonResistance._permanent + c.itemScan(14) + c._poisonResistance._temporary,
+ c._energyResistance._permanent + c.itemScan(15) + c._energyResistance._temporary,
+ c._magicResistance._permanent + c.itemScan(16) + c._magicResistance._temporary);
bounds.setHeight(80);
break;
diff --git a/engines/mm/xeen/dialogs/dialogs_create_char.cpp b/engines/mm/xeen/dialogs/dialogs_create_char.cpp
index cb447cf02ee..f4eaf8c9e7f 100644
--- a/engines/mm/xeen/dialogs/dialogs_create_char.cpp
+++ b/engines/mm/xeen/dialogs/dialogs_create_char.cpp
@@ -606,12 +606,12 @@ bool CreateCharacterDialog::saveCharacter(Character &c, int classId, Race race,
c._accuracy._permanent = _attribs[ACCURACY];
c._luck._permanent = _attribs[LUCK];
- c._magicResistence._permanent = Res.RACE_MAGIC_RESISTENCES[race];
- c._fireResistence._permanent = Res.RACE_FIRE_RESISTENCES[race];
- c._electricityResistence._permanent = Res.RACE_ELECTRIC_RESISTENCES[race];
- c._coldResistence._permanent = Res.RACE_COLD_RESISTENCES[race];
- c._energyResistence._permanent = Res.RACE_ENERGY_RESISTENCES[race];
- c._poisonResistence._permanent = Res.RACE_POISON_RESISTENCES[race];
+ c._magicResistance._permanent = Res.RACE_MAGIC_RESISTANCES[race];
+ c._fireResistance._permanent = Res.RACE_FIRE_RESISTANCES[race];
+ c._electricityResistance._permanent = Res.RACE_ELECTRIC_RESISTANCES[race];
+ c._coldResistance._permanent = Res.RACE_COLD_RESISTANCES[race];
+ c._energyResistance._permanent = Res.RACE_ENERGY_RESISTANCES[race];
+ c._poisonResistance._permanent = Res.RACE_POISON_RESISTANCES[race];
c._birthYear = party._year - 18;
c._birthDay = party._day;
diff --git a/engines/mm/xeen/dialogs/dialogs_info.cpp b/engines/mm/xeen/dialogs/dialogs_info.cpp
index 1ea7d7e573d..1408bd99f58 100644
--- a/engines/mm/xeen/dialogs/dialogs_info.cpp
+++ b/engines/mm/xeen/dialogs/dialogs_info.cpp
@@ -90,24 +90,24 @@ void InfoDialog::protectionText() {
_lines.push_back(Common::String::format(Res.LIGHT_COUNT_TEXT, party._lightCount));
}
- if (party._fireResistence) {
- _lines.push_back(Common::String::format(Res.FIRE_RESISTENCE_TEXT,
- _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._fireResistence));
+ if (party._fireResistance) {
+ _lines.push_back(Common::String::format(Res.FIRE_RESISTANCE_TEXT,
+ _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._fireResistance));
}
- if (party._electricityResistence) {
- _lines.push_back(Common::String::format(Res.ELECRICITY_RESISTENCE_TEXT,
- _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._electricityResistence));
+ if (party._electricityResistance) {
+ _lines.push_back(Common::String::format(Res.ELECRICITY_RESISTANCE_TEXT,
+ _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._electricityResistance));
}
- if (party._coldResistence) {
- _lines.push_back(Common::String::format(Res.COLD_RESISTENCE_TEXT,
- _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._coldResistence));
+ if (party._coldResistance) {
+ _lines.push_back(Common::String::format(Res.COLD_RESISTANCE_TEXT,
+ _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._coldResistance));
}
- if (party._poisonResistence) {
- _lines.push_back(Common::String::format(Res.POISON_RESISTENCE_TEXT,
- _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._poisonResistence));
+ if (party._poisonResistance) {
+ _lines.push_back(Common::String::format(Res.POISON_RESISTANCE_TEXT,
+ _lines.size() == 0 ? 10 : 1, AA_L024, AA_R124, party._poisonResistance));
}
if (party._clairvoyanceActive) {
diff --git a/engines/mm/xeen/interface.cpp b/engines/mm/xeen/interface.cpp
index d1d8fbae25e..e6685cfc8eb 100644
--- a/engines/mm/xeen/interface.cpp
+++ b/engines/mm/xeen/interface.cpp
@@ -1516,22 +1516,22 @@ void Interface::assembleBorder() {
// Draw resistance indicators
if (!windows[10]._enabled && !windows[2]._enabled
&& !windows[38]._enabled) {
- _fecpSprites.draw(0, _vm->_party->_fireResistence ? 1 : 0,
+ _fecpSprites.draw(0, _vm->_party->_fireResistance ? 1 : 0,
Common::Point(2, 2));
- _fecpSprites.draw(0, _vm->_party->_electricityResistence ? 3 : 2,
+ _fecpSprites.draw(0, _vm->_party->_electricityResistance ? 3 : 2,
Common::Point(219, 2));
- _fecpSprites.draw(0, _vm->_party->_coldResistence ? 5 : 4,
+ _fecpSprites.draw(0, _vm->_party->_coldResistance ? 5 : 4,
Common::Point(2, 134));
- _fecpSprites.draw(0, _vm->_party->_poisonResistence ? 7 : 6,
+ _fecpSprites.draw(0, _vm->_party->_poisonResistance ? 7 : 6,
Common::Point(219, 134));
} else {
- _fecpSprites.draw(0, _vm->_party->_fireResistence ? 9 : 8,
+ _fecpSprites.draw(0, _vm->_party->_fireResistance ? 9 : 8,
Common::Point(8, 8));
- _fecpSprites.draw(0, _vm->_party->_electricityResistence ? 11 : 10,
+ _fecpSprites.draw(0, _vm->_party->_electricityResistance ? 11 : 10,
Common::Point(219, 8));
- _fecpSprites.draw(0, _vm->_party->_coldResistence ? 13 : 12,
+ _fecpSprites.draw(0, _vm->_party->_coldResistance ? 13 : 12,
Common::Point(8, 134));
- _fecpSprites.draw(0, _vm->_party->_poisonResistence ? 15 : 14,
+ _fecpSprites.draw(0, _vm->_party->_poisonResistance ? 15 : 14,
Common::Point(219, 134));
}
diff --git a/engines/mm/xeen/item.cpp b/engines/mm/xeen/item.cpp
index 09a88fec9dd..5d7f767a3d0 100644
--- a/engines/mm/xeen/item.cpp
+++ b/engines/mm/xeen/item.cpp
@@ -590,13 +590,13 @@ Common::String ArmorItems::getAttributes(XeenItem &item, const Common::String &c
elemResist = attrBonus = acBonus = Res.FIELD_NONE;
if (item._material < 36) {
- int resistence = Res.ELEMENTAL_RESISTENCES[item._material];
- if (resistence > 0) {
+ int resistance = Res.ELEMENTAL_RESISTANCES[item._material];
+ if (resistance > 0) {
int eCategory = ELEM_FIRE;
while (eCategory < ELEM_MAGIC && Res.ELEMENTAL_CATEGORIES[eCategory] < item._material)
++eCategory;
- elemResist = Common::String::format(Res.ATTR_XY_BONUS, resistence,
+ elemResist = Common::String::format(Res.ATTR_XY_BONUS, resistance,
Res.ELEMENTAL_NAMES[eCategory]);
}
} else if (item._material >= 59) {
@@ -701,13 +701,13 @@ Common::String AccessoryItems::getAttributes(XeenItem &item, const Common::Strin
elemResist = attrBonus = Res.FIELD_NONE;
if (item._material < 36) {
- int resistence = Res.ELEMENTAL_RESISTENCES[item._material];
- if (resistence > 0) {
+ int resistance = Res.ELEMENTAL_RESISTANCES[item._material];
+ if (resistance > 0) {
int eCategory = ELEM_FIRE;
while (eCategory < ELEM_MAGIC && Res.ELEMENTAL_CATEGORIES[eCategory] < item._material)
++eCategory;
- elemResist = Common::String::format(Res.ATTR_XY_BONUS, resistence,
+ elemResist = Common::String::format(Res.ATTR_XY_BONUS, resistance,
Res.ELEMENTAL_NAMES[eCategory]);
}
} else if (item._material >= 59) {
diff --git a/engines/mm/xeen/locations.cpp b/engines/mm/xeen/locations.cpp
index b99c808c0e8..79b5041f06c 100644
--- a/engines/mm/xeen/locations.cpp
+++ b/engines/mm/xeen/locations.cpp
@@ -952,12 +952,12 @@ Character *TempleLocation::doOptions(Character *c) {
}
} else if (Res.KeyConstants.Locations.KEY_HEAL == _buttonValue) {
if (_healCost && party.subtract(CONS_GOLD, _healCost, WHERE_PARTY, WT_LOC_WAIT)) {
- c->_magicResistence._temporary = 0;
- c->_energyResistence._temporary = 0;
- c->_poisonResistence._temporary = 0;
- c->_electricityResistence._temporary = 0;
- c->_coldResistence._temporary = 0;
- c->_fireResistence._temporary = 0;
+ c->_magicResistance._temporary = 0;
+ c->_energyResistance._temporary = 0;
+ c->_poisonResistance._temporary = 0;
+ c->_electricityResistance._temporary = 0;
+ c->_coldResistance._temporary = 0;
+ c->_fireResistance._temporary = 0;
c->_ACTemp = 0;
c->_level._temporary = 0;
c->_luck._temporary = 0;
diff --git a/engines/mm/xeen/map.cpp b/engines/mm/xeen/map.cpp
index f32185fe424..698f70577ef 100644
--- a/engines/mm/xeen/map.cpp
+++ b/engines/mm/xeen/map.cpp
@@ -53,13 +53,13 @@ MonsterStruct::MonsterStruct() {
_hitChance = 0;
_rangeAttack = 0;
_monsterType = MONSTER_MONSTERS;
- _fireResistence = 0;
- _electricityResistence = 0;
- _coldResistence = 0;
- _poisonResistence = 0;
- _energyResistence = 0;
- _magicResistence = 0;
- _phsyicalResistence = 0;
+ _fireResistance = 0;
+ _electricityResistance = 0;
+ _coldResistance = 0;
+ _poisonResistance = 0;
+ _energyResistance = 0;
+ _magicResistance = 0;
+ _phsyicalResistance = 0;
_field29 = 0;
_gold = 0;
_gems = 0;
@@ -75,19 +75,19 @@ MonsterStruct::MonsterStruct(Common::String name, int experience, int hp, int ar
int speed, int numberOfAttacks, CharacterClass hatesClass, int strikes,
int dmgPerStrike, DamageType attackType, SpecialAttack specialAttack,
int hitChance, int rangeAttack, MonsterType monsterType,
- int fireResistence, int electricityResistence, int coldResistence,
- int poisonResistence, int energyResistence, int magicResistence,
- int phsyicalResistence, int field29, int gold, int gems, int itemDrop,
+ int fireResistance, int electricityResistance, int coldResistance,
+ int poisonResistance, int energyResistance, int magicResistance,
+ int phsyicalResistance, 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), _armorClass(armorClass),
_speed(speed), _numberOfAttacks(numberOfAttacks), _hatesClass(hatesClass),
_strikes(strikes), _dmgPerStrike(dmgPerStrike), _attackType(attackType),
_specialAttack(specialAttack), _hitChance(hitChance), _rangeAttack(rangeAttack),
- _monsterType(monsterType), _fireResistence(fireResistence),
- _electricityResistence(electricityResistence), _coldResistence(coldResistence),
- _poisonResistence(poisonResistence), _energyResistence(energyResistence),
- _magicResistence(magicResistence), _phsyicalResistence(phsyicalResistence),
+ _monsterType(monsterType), _fireResistance(fireResistance),
+ _electricityResistance(electricityResistance), _coldResistance(coldResistance),
+ _poisonResistance(poisonResistance), _energyResistance(energyResistance),
+ _magicResistance(magicResistance), _phsyicalResistance(phsyicalResistance),
_field29(field29), _gold(gold), _gems(gems), _itemDrop(itemDrop),
_flying(flying), _imageNumber(imageNumber), _loopAnimation(loopAnimation),
_animationEffect(animationEffect), _fx(fx), _attackVoc(attackVoc) {
@@ -113,13 +113,13 @@ void MonsterStruct::synchronize(Common::SeekableReadStream &s) {
_hitChance = s.readByte();
_rangeAttack = s.readByte();
_monsterType = (MonsterType)s.readByte();
- _fireResistence = s.readByte();
- _electricityResistence = s.readByte();
- _coldResistence = s.readByte();
- _poisonResistence = s.readByte();
- _energyResistence = s.readByte();
- _magicResistence = s.readByte();
- _phsyicalResistence = s.readByte();
+ _fireResistance = s.readByte();
+ _electricityResistance = s.readByte();
+ _coldResistance = s.readByte();
+ _poisonResistance = s.readByte();
+ _energyResistance = s.readByte();
+ _magicResistance = s.readByte();
+ _phsyicalResistance = s.readByte();
_field29 = s.readByte();
_gold = s.readUint16LE();
_gems = s.readByte();
diff --git a/engines/mm/xeen/map.h b/engines/mm/xeen/map.h
index 436529b288e..fde4bdbd976 100644
--- a/engines/mm/xeen/map.h
+++ b/engines/mm/xeen/map.h
@@ -67,13 +67,13 @@ public:
int _hitChance;
int _rangeAttack;
MonsterType _monsterType;
- int _fireResistence;
- int _electricityResistence;
- int _coldResistence;
- int _poisonResistence;
- int _energyResistence;
- int _magicResistence;
- int _phsyicalResistence;
+ int _fireResistance;
+ int _electricityResistance;
+ int _coldResistance;
+ int _poisonResistance;
+ int _energyResistance;
+ int _magicResistance;
+ int _phsyicalResistance;
int _field29;
int _gold;
int _gems;
@@ -90,9 +90,9 @@ public:
int speed, int numberOfAttacks, CharacterClass hatesClass, int strikes,
int dmgPerStrike, DamageType attackType, SpecialAttack specialAttack,
int hitChance, int rangeAttack, MonsterType monsterType,
- int fireResistence, int electricityResistence, int coldResistence,
- int poisonResistence, int energyResistence, int magicResistence,
- int phsyicalResistence, int field29, int gold, int gems, int itemDrop,
+ int fireResistance, int electricityResistance, int coldResistance,
+ int poisonResistance, int energyResistance, int magicResistance,
+ int phsyicalResistance, int field29, int gold, int gems, int itemDrop,
bool flying, int imageNumber, int loopAnimation, int animationEffect,
int field32, Common::String attackVoc);
diff --git a/engines/mm/xeen/party.cpp b/engines/mm/xeen/party.cpp
index bcdda2305ea..bae9d802003 100644
--- a/engines/mm/xeen/party.cpp
+++ b/engines/mm/xeen/party.cpp
@@ -228,10 +228,10 @@ Party::Party(XeenEngine *vm) {
_food = 0;
_lightCount = 0;
_torchCount = 0;
- _fireResistence = 0;
- _electricityResistence = 0;
- _coldResistence = 0;
- _poisonResistence = 0;
+ _fireResistance = 0;
+ _electricityResistance = 0;
+ _coldResistance = 0;
+ _poisonResistance = 0;
_deathCount = 0;
_winCount = 0;
_lossCount = 0;
@@ -315,10 +315,10 @@ void Party::synchronize(Common::Serializer &s) {
s.syncAsUint16LE(_food);
s.syncAsUint16LE(_lightCount);
s.syncAsUint16LE(_torchCount);
- s.syncAsUint16LE(_fireResistence);
- s.syncAsUint16LE(_electricityResistence);
- s.syncAsUint16LE(_coldResistence);
- s.syncAsUint16LE(_poisonResistence);
+ s.syncAsUint16LE(_fireResistance);
+ s.syncAsUint16LE(_electricityResistance);
+ s.syncAsUint16LE(_coldResistance);
+ s.syncAsUint16LE(_poisonResistance);
s.syncAsUint16LE(_deathCount);
s.syncAsUint16LE(_winCount);
s.syncAsUint16LE(_lossCount);
@@ -553,12 +553,12 @@ void Party::resetTemps() {
for (int idx = 0; idx < (int)_activeParty.size(); ++idx) {
Character &player = _activeParty[idx];
- player._magicResistence._temporary = 0;
- player._energyResistence._temporary = 0;
- player._poisonResistence._temporary = 0;
- player._electricityResistence._temporary = 0;
- player._coldResistence._temporary = 0;
- player._fireResistence._temporary = 0;
+ player._magicResistance._temporary = 0;
+ player._energyResistance._temporary = 0;
+ player._poisonResistance._temporary = 0;
+ player._electricityResistance._temporary = 0;
+ player._coldResistance._temporary = 0;
+ player._fireResistance._temporary = 0;
player._ACTemp = 0;
player._level._temporary = 0;
player._luck._temporary = 0;
@@ -570,10 +570,10 @@ void Party::resetTemps() {
player._might._temporary = 0;
}
- _poisonResistence = 0;
- _coldResistence = 0;
- _electricityResistence = 0;
- _fireResistence = 0;
+ _poisonResistance = 0;
+ _coldResistance = 0;
+ _electricityResistance = 0;
+ _fireResistance = 0;
_lightCount = 0;
_levitateCount = 0;
_walkOnWaterActive = false;
@@ -926,7 +926,7 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
ps._experience -= takeVal;
break;
case 17:
- _poisonResistence -= takeVal;
+ _poisonResistance -= takeVal;
break;
case 18:
ps._conditions[takeVal] = 0;
@@ -1047,40 +1047,40 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
ps._luck._permanent -= takeVal;
break;
case 52:
- ps._fireResistence._permanent -= takeVal;
+ ps._fireResistance._permanent -= takeVal;
break;
case 53:
- ps._electricityResistence._permanent -= takeVal;
+ ps._electricityResistance._permanent -= takeVal;
break;
case 54:
- ps._coldResistence._permanent -= takeVal;
+ ps._coldResistance._permanent -= takeVal;
break;
case 55:
- ps._poisonResistence._permanent -= takeVal;
+ ps._poisonResistance._permanent -= takeVal;
break;
case 56:
- ps._energyResistence._permanent -= takeVal;
+ ps._energyResistance._permanent -= takeVal;
break;
case 57:
- ps._magicResistence._permanent -= takeVal;
+ ps._magicResistance._permanent -= takeVal;
break;
case 58:
- ps._fireResistence._temporary -= takeVal;
+ ps._fireResistance._temporary -= takeVal;
break;
case 59:
- ps._electricityResistence._temporary -= takeVal;
+ ps._electricityResistance._temporary -= takeVal;
break;
case 60:
- ps._coldResistence._temporary -= takeVal;
+ ps._coldResistance._temporary -= takeVal;
break;
case 61:
- ps._poisonResistence._temporary -= takeVal;
+ ps._poisonResistance._temporary -= takeVal;
break;
case 62:
- ps._energyResistence._temporary -= takeVal;
+ ps._energyResistance._temporary -= takeVal;
break;
case 63:
- ps._magicResistence._temporary -= takeVal;
+ ps._magicResistance._temporary -= takeVal;
break;
case 64:
ps._level._permanent -= takeVal;
@@ -1096,21 +1096,21 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
_lightCount -= takeVal;
break;
case 71:
- _fireResistence -= takeVal;
+ _fireResistance -= takeVal;
break;
case 72:
- _electricityResistence -= takeVal;
+ _electricityResistance -= takeVal;
break;
case 73:
- _coldResistence -= takeVal;
+ _coldResistance -= takeVal;
break;
case 74:
_levitateCount -= takeVal;
_lightCount -= takeVal;
- _fireResistence -= takeVal;
- _electricityResistence -= takeVal;
- _coldResistence -= takeVal;
- _poisonResistence -= takeVal;
+ _fireResistance -= takeVal;
+ _electricityResistance -= takeVal;
+ _coldResistance -= takeVal;
+ _poisonResistance -= takeVal;
_walkOnWaterActive = false;
break;
case 76:
@@ -1179,7 +1179,7 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
intf.spellFX(&ps);
break;
case 17:
- _poisonResistence += giveVal;
+ _poisonResistance += giveVal;
break;
case 18:
if (giveVal == 16) {
@@ -1321,51 +1321,51 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
intf.spellFX(&ps);
break;
case 52:
- ps._fireResistence._permanent = MIN(ps._fireResistence._permanent + giveVal, (uint)255);
+ ps._fireResistance._permanent = MIN(ps._fireResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 53:
- ps._electricityResistence._permanent = MIN(ps._electricityResistence._permanent + giveVal, (uint)255);
+ ps._electricityResistance._permanent = MIN(ps._electricityResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 54:
- ps._coldResistence._permanent = MIN(ps._coldResistence._permanent + giveVal, (uint)255);
+ ps._coldResistance._permanent = MIN(ps._coldResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 55:
- ps._poisonResistence._permanent = MIN(ps._poisonResistence._permanent + giveVal, (uint)255);
+ ps._poisonResistance._permanent = MIN(ps._poisonResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 56:
- ps._energyResistence._permanent = MIN(ps._energyResistence._permanent + giveVal, (uint)255);
+ ps._energyResistance._permanent = MIN(ps._energyResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 57:
- ps._magicResistence._permanent = MIN(ps._magicResistence._permanent + giveVal, (uint)255);
+ ps._magicResistance._permanent = MIN(ps._magicResistance._permanent + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 58:
- ps._fireResistence._temporary = MIN(ps._fireResistence._temporary + giveVal, (uint)255);
+ ps._fireResistance._temporary = MIN(ps._fireResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 59:
- ps._electricityResistence._temporary = MIN(ps._electricityResistence._temporary + giveVal, (uint)255);
+ ps._electricityResistance._temporary = MIN(ps._electricityResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 60:
- ps._coldResistence._temporary = MIN(ps._coldResistence._temporary + giveVal, (uint)255);
+ ps._coldResistance._temporary = MIN(ps._coldResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 61:
- ps._poisonResistence._temporary = MIN(ps._poisonResistence._temporary + giveVal, (uint)255);
+ ps._poisonResistance._temporary = MIN(ps._poisonResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 62:
- ps._energyResistence._temporary = MIN(ps._energyResistence._temporary + giveVal, (uint)255);
+ ps._energyResistance._temporary = MIN(ps._energyResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 63:
- ps._magicResistence._temporary = MIN(ps._magicResistence._temporary + giveVal, (uint)255);
+ ps._magicResistance._temporary = MIN(ps._magicResistance._temporary + giveVal, (uint)255);
intf.spellFX(&ps);
break;
case 64:
@@ -1408,21 +1408,21 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
_lightCount += giveVal;
break;
case 71:
- _fireResistence += giveVal;
+ _fireResistance += giveVal;
break;
case 72:
- _electricityResistence += giveVal;
+ _electricityResistance += giveVal;
break;
case 73:
- _coldResistence += giveVal;
+ _coldResistance += giveVal;
break;
case 74:
_levitateCount += giveVal;
_lightCount += giveVal;
- _fireResistence += giveVal;
- _electricityResistence += giveVal;
- _coldResistence += giveVal;
- _poisonResistence += giveVal;
+ _fireResistance += giveVal;
+ _electricityResistance += giveVal;
+ _coldResistance += giveVal;
+ _poisonResistance += giveVal;
_walkOnWaterActive = false;
break;
case 76:
diff --git a/engines/mm/xeen/party.h b/engines/mm/xeen/party.h
index e52a94f167e..782005d24f2 100644
--- a/engines/mm/xeen/party.h
+++ b/engines/mm/xeen/party.h
@@ -216,10 +216,10 @@ public:
uint _food;
int _lightCount;
int _torchCount;
- int _fireResistence;
- int _electricityResistence;
- int _coldResistence;
- int _poisonResistence;
+ int _fireResistance;
+ int _electricityResistance;
+ int _coldResistance;
+ int _poisonResistance;
int _deathCount;
int _winCount;
int _lossCount;
diff --git a/engines/mm/xeen/resources.cpp b/engines/mm/xeen/resources.cpp
index 0551460945d..f4475f7f8d0 100644
--- a/engines/mm/xeen/resources.cpp
+++ b/engines/mm/xeen/resources.cpp
@@ -150,7 +150,7 @@ void Resources::loadData() {
file.syncNumbers(ELEMENTAL_CATEGORIES, 6);
file.syncNumbers(ATTRIBUTE_CATEGORIES, 10);
file.syncNumbers(ATTRIBUTE_BONUSES, 72);
- file.syncNumbers(ELEMENTAL_RESISTENCES, 37);
+ file.syncNumbers(ELEMENTAL_RESISTANCES, 37);
file.syncNumbers(ELEMENTAL_DAMAGE, 37);
file.syncNumbers(WEAPON_DAMAGE_BASE, 35);
file.syncNumbers(WEAPON_DAMAGE_MULTIPLIER, 35);
@@ -215,10 +215,10 @@ void Resources::loadData() {
file.syncString(SPELL_PURCHASE);
file.syncString(MAP_TEXT);
file.syncString(LIGHT_COUNT_TEXT);
- file.syncString(FIRE_RESISTENCE_TEXT);
- file.syncString(ELECRICITY_RESISTENCE_TEXT);
- file.syncString(COLD_RESISTENCE_TEXT);
- file.syncString(POISON_RESISTENCE_TEXT);
+ file.syncString(FIRE_RESISTANCE_TEXT);
+ file.syncString(ELECRICITY_RESISTANCE_TEXT);
+ file.syncString(COLD_RESISTANCE_TEXT);
+ file.syncString(POISON_RESISTANCE_TEXT);
file.syncString(CLAIRVOYANCE_TEXT);
file.syncString(LEVITATE_TEXT);
file.syncString(WALK_ON_WATER_TEXT);
@@ -240,7 +240,7 @@ void Resources::loadData() {
file.syncStrings(BORN, 2);
file.syncString(AGE_TEXT);
file.syncString(LEVEL_TEXT);
- file.syncString(RESISTENCES_TEXT);
+ file.syncString(RESISTANCES_TEXT);
file.syncString(NONE);
file.syncString(EXPERIENCE_TEXT);
file.syncString(ELIGIBLE);
@@ -365,12 +365,12 @@ void Resources::loadData() {
file.syncNumbers((int *)NEW_CHAR_SKILLS_OFFSET, 10);
file.syncNumbers((int *)NEW_CHAR_SKILLS_LEN, 10);
file.syncNumbers((int *)NEW_CHAR_RACE_SKILLS, 10);
- file.syncNumbers((int *)RACE_MAGIC_RESISTENCES, 5);
- file.syncNumbers((int *)RACE_FIRE_RESISTENCES, 5);
- file.syncNumbers((int *)RACE_ELECTRIC_RESISTENCES, 5);
- file.syncNumbers((int *)RACE_COLD_RESISTENCES, 5);
- file.syncNumbers((int *)RACE_ENERGY_RESISTENCES, 5);
- file.syncNumbers((int *)RACE_POISON_RESISTENCES, 5);
+ file.syncNumbers((int *)RACE_MAGIC_RESISTANCES, 5);
+ file.syncNumbers((int *)RACE_FIRE_RESISTANCES, 5);
+ file.syncNumbers((int *)RACE_ELECTRIC_RESISTANCES, 5);
+ file.syncNumbers((int *)RACE_COLD_RESISTANCES, 5);
+ file.syncNumbers((int *)RACE_ENERGY_RESISTANCES, 5);
+ file.syncNumbers((int *)RACE_POISON_RESISTANCES, 5);
file.syncNumbers2D((int *)NEW_CHARACTER_SPELLS, 10, 4);
file.syncString(COMBAT_DETAILS);
file.syncString(NOT_ENOUGH_TO_CAST);
diff --git a/engines/mm/xeen/resources.h b/engines/mm/xeen/resources.h
index 980b055970d..a3bab477052 100644
--- a/engines/mm/xeen/resources.h
+++ b/engines/mm/xeen/resources.h
@@ -196,7 +196,7 @@ public:
int ELEMENTAL_CATEGORIES[6];
int ATTRIBUTE_CATEGORIES[10];
int ATTRIBUTE_BONUSES[72];
- int ELEMENTAL_RESISTENCES[37];
+ int ELEMENTAL_RESISTANCES[37];
int ELEMENTAL_DAMAGE[37];
int WEAPON_DAMAGE_BASE[35];
int WEAPON_DAMAGE_MULTIPLIER[35];
@@ -261,10 +261,10 @@ public:
const char *SPELL_PURCHASE;
const char *MAP_TEXT;
const char *LIGHT_COUNT_TEXT;
- const char *FIRE_RESISTENCE_TEXT;
- const char *ELECRICITY_RESISTENCE_TEXT;
- const char *COLD_RESISTENCE_TEXT;
- const char *POISON_RESISTENCE_TEXT;
+ const char *FIRE_RESISTANCE_TEXT;
+ const char *ELECRICITY_RESISTANCE_TEXT;
+ const char *COLD_RESISTANCE_TEXT;
+ const char *POISON_RESISTANCE_TEXT;
const char *CLAIRVOYANCE_TEXT;
const char *LEVITATE_TEXT;
const char *WALK_ON_WATER_TEXT;
@@ -286,7 +286,7 @@ public:
const char *BORN[2];
const char *AGE_TEXT;
const char *LEVEL_TEXT;
- const char *RESISTENCES_TEXT;
+ const char *RESISTANCES_TEXT;
const char *NONE;
const char *EXPERIENCE_TEXT;
const char *ELIGIBLE;
@@ -411,12 +411,12 @@ public:
int NEW_CHAR_SKILLS_OFFSET[10];
int NEW_CHAR_SKILLS_LEN[10];
int NEW_CHAR_RACE_SKILLS[10];
- int RACE_MAGIC_RESISTENCES[5];
- int RACE_FIRE_RESISTENCES[5];
- int RACE_ELECTRIC_RESISTENCES[5];
- int RACE_COLD_RESISTENCES[5];
- int RACE_ENERGY_RESISTENCES[5];
- int RACE_POISON_RESISTENCES[5];
+ int RACE_MAGIC_RESISTANCES[5];
+ int RACE_FIRE_RESISTANCES[5];
+ int RACE_ELECTRIC_RESISTANCES[5];
+ int RACE_COLD_RESISTANCES[5];
+ int RACE_ENERGY_RESISTANCES[5];
+ int RACE_POISON_RESISTANCES[5];
int NEW_CHARACTER_SPELLS[10][4];
const char *COMBAT_DETAILS;
const char *NOT_ENOUGH_TO_CAST;
diff --git a/engines/mm/xeen/scripts.cpp b/engines/mm/xeen/scripts.cpp
index 91ade854741..81b154ea5b8 100644
--- a/engines/mm/xeen/scripts.cpp
+++ b/engines/mm/xeen/scripts.cpp
@@ -1613,7 +1613,7 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
break;
case 17:
// Party poison resistance
- v = party._poisonResistence;
+ v = party._poisonResistance;
break;
case 18:
// Condition
@@ -1753,51 +1753,51 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
break;
case 52:
// Fire resistance (before bonus)
- v = ps->_fireResistence._permanent;
+ v = ps->_fireResistance._permanent;
break;
case 53:
// Elecricity resistance (before bonus)
- v = ps->_electricityResistence._permanent;
+ v = ps->_electricityResistance._permanent;
break;
case 54:
// Cold resistance (before bonus)
- v = ps->_coldResistence._permanent;
+ v = ps->_coldResistance._permanent;
break;
case 55:
// Poison resistance (before bonus)
- v = ps->_poisonResistence._permanent;
+ v = ps->_poisonResistance._permanent;
break;
case 56:
// Energy reistence (before bonus)
- v = ps->_energyResistence._permanent;
+ v = ps->_energyResistance._permanent;
break;
case 57:
// Energy resistance (before bonus)
- v = ps->_magicResistence._permanent;
+ v = ps->_magicResistance._permanent;
break;
case 58:
// Fire resistance (extra beyond base)
- v = ps->_fireResistence._temporary;
+ v = ps->_fireResistance._temporary;
break;
case 59:
// Electricity resistance (extra beyond base)
- v = ps->_electricityResistence._temporary;
+ v = ps->_electricityResistance._temporary;
break;
case 60:
// Cold resistance (extra beyond base)
- v = ps->_coldResistence._temporary;
+ v = ps->_coldResistance._temporary;
break;
case 61:
// Poison resistance (extra beyond base)
- v = ps->_poisonResistence._temporary;
+ v = ps->_poisonResistance._temporary;
break;
case 62:
// Energy resistance (extra beyond base)
- v = ps->_energyResistence._temporary;
+ v = ps->_energyResistance._temporary;
break;
case 63:
// Magic resistance (extra beyond base)
- v = ps->_magicResistence._temporary;
+ v = ps->_magicResistance._temporary;
break;
case 64:
// Level (before bonus)
@@ -1816,15 +1816,15 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
break;
case 71:
// Party magical fire resistance
- v = party._fireResistence;
+ v = party._fireResistance;
break;
case 72:
// Party magical electricity resistance
- v = party._electricityResistence;
+ v = party._electricityResistance;
break;
case 73:
// Party magical cold resistance
- v = party._coldResistence;
+ v = party._coldResistance;
break;
case 76:
// Day of the year (100 per year)
diff --git a/engines/mm/xeen/spells.cpp b/engines/mm/xeen/spells.cpp
index 88cb16061fc..c39c6715f39 100644
--- a/engines/mm/xeen/spells.cpp
+++ b/engines/mm/xeen/spells.cpp
@@ -401,10 +401,10 @@ void Spells::dayOfProtection() {
party._heroism = lvl;
party._holyBonus = lvl;
party._blessed = lvl;
- party._poisonResistence = lvl;
- party._coldResistence = lvl;
- party._electricityResistence = lvl;
- party._fireResistence = lvl;
+ party._poisonResistance = lvl;
+ party._coldResistance = lvl;
+ party._electricityResistance = lvl;
+ party._fireResistance = lvl;
party._lightCount = lvl;
sound.playFX(20);
}
@@ -940,16 +940,16 @@ void Spells::protectionFromElements() {
if (elementType != -1) {
switch (elementType) {
case DT_FIRE:
- party._fireResistence = resist;
+ party._fireResistance = resist;
break;
case DT_ELECTRICAL:
- party._fireResistence = resist;
+ party._fireResistance = resist;
break;
case DT_COLD:
- party._coldResistence = resist;
+ party._coldResistance = resist;
break;
case DT_POISON:
- party._poisonResistence = resist;
+ party._poisonResistance = resist;
break;
default:
break;
More information about the Scummvm-git-logs
mailing list