From 6ac8c8288cb67ae701701e571577b45791130db7 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 15 Jan 2018 19:22:37 -0500 Subject: XEEN: Renaming of MazeMonster _fieldA --- engines/xeen/combat.cpp | 4 ++-- engines/xeen/interface_scene.cpp | 8 ++++---- engines/xeen/map.cpp | 2 +- engines/xeen/map.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'engines/xeen') diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 34623f1832..c1c70ac86c 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -808,7 +808,7 @@ void Combat::doMonsterTurn(int monsterId) { return; monster._frame = 8; - monster._fieldA = 3; + monster._postAttackDelay = 3; monster._field9 = 0; intf.draw3d(true); intf.draw3d(true); @@ -1422,7 +1422,7 @@ void Combat::attack2(int damage, RangeType rangeType) { _charsArray1[_monsterIndex] = 3; _monPow[_monsterIndex] = _damageType == DT_PHYSICAL && (rangeType == 3 || rangeType == 0); monster._frame = 11; - monster._fieldA = 5; + monster._postAttackDelay = 5; } int monsterResist = getMonsterResistence(rangeType); diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp index aa073d34b5..ed8ab766c2 100644 --- a/engines/xeen/interface_scene.cpp +++ b/engines/xeen/interface_scene.cpp @@ -723,14 +723,14 @@ void InterfaceScene::animate3d() { monster._field9 = 0; } } else if (monster._frame == 11) { - --monster._fieldA; - if (monster._fieldA == 0) + --monster._postAttackDelay; + if (monster._postAttackDelay == 0) monster._frame = 0; } else { ++monster._frame; if (monster._frame == 11) { - --monster._fieldA; - monster._frame = monster._fieldA ? 10 : 0; + --monster._postAttackDelay; + monster._frame = monster._postAttackDelay ? 10 : 0; } } } diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp index 20a6c841c8..b7f573c6f5 100644 --- a/engines/xeen/map.cpp +++ b/engines/xeen/map.cpp @@ -685,7 +685,7 @@ MazeMonster::MazeMonster() { _isAttacking = false; _damageType = DT_PHYSICAL; _field9 = 0; - _fieldA = 0; + _postAttackDelay = 0; _hp = 0; _effect1 = _effect2 = 0; _effect3 = 0; diff --git a/engines/xeen/map.h b/engines/xeen/map.h index b8b77c49ff..e4cf148dcf 100644 --- a/engines/xeen/map.h +++ b/engines/xeen/map.h @@ -265,7 +265,7 @@ struct MazeMonster { bool _isAttacking; DamageType _damageType; int _field9; - int _fieldA; + int _postAttackDelay; int _hp; int _effect1, _effect2; int _effect3; -- cgit v1.2.3