[Scummvm-git-logs] scummvm master -> 6ac8c8288cb67ae701701e571577b45791130db7

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8fea5fd3c8 XEEN: Fix monsters to resume idling after finishing attacks
6ac8c8288c XEEN: Renaming of MazeMonster _fieldA


Commit: 8fea5fd3c8717e2a33372dae7ee2e7ecc7d5c539
    https://github.com/scummvm/scummvm/commit/8fea5fd3c8717e2a33372dae7ee2e7ecc7d5c539
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-15T19:15:51-05:00

Commit Message:
XEEN: Fix monsters to resume idling after finishing attacks

Changed paths:
    engines/xeen/interface_scene.cpp


diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp
index f259315..aa073d3 100644
--- a/engines/xeen/interface_scene.cpp
+++ b/engines/xeen/interface_scene.cpp
@@ -729,7 +729,7 @@ void InterfaceScene::animate3d() {
 			} else {
 				++monster._frame;
 				if (monster._frame == 11) {
-					--monster._frame;
+					--monster._fieldA;
 					monster._frame = monster._fieldA ? 10 : 0;
 				}
 			}


Commit: 6ac8c8288cb67ae701701e571577b45791130db7
    https://github.com/scummvm/scummvm/commit/6ac8c8288cb67ae701701e571577b45791130db7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-15T19:22:37-05:00

Commit Message:
XEEN: Renaming of MazeMonster _fieldA

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/interface_scene.cpp
    engines/xeen/map.cpp
    engines/xeen/map.h


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 34623f1..c1c70ac 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 aa073d3..ed8ab76 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 20a6c84..b7f573c 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 b8b77c4..e4cf148 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;