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

[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:
aaee877250 XEEN: Cleanup up usage of RangeType enum


Commit: aaee8772500ab3727dfcff724b5cd6b491d98476
    https://github.com/scummvm/scummvm/commit/aaee8772500ab3727dfcff724b5cd6b491d98476
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-10T07:14:43-05:00

Commit Message:
XEEN: Cleanup up usage of RangeType enum

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/combat.h
    engines/xeen/item.h


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 35283f2..0c0836a 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1201,7 +1201,7 @@ void Combat::attack(Character &c, RangeType rangeType) {
 	int monsterDataIndex = monster._spriteId;
 	MonsterStruct &monsterData = map._monsterData[monsterDataIndex];
 
-	if (rangeType) {
+	if (rangeType != RT_SINGLE) {
 		if (_shootType != ST_1 || _damageType == DT_MAGIC_ARROW) {
 			if (!monsterData._magicResistence || monsterData._magicResistence <=
 					_vm->getRandomNumber(1, 100 + _oldCharacter->getCurrentLevel())) {
@@ -1396,7 +1396,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
 	MonsterStruct &monsterData = *monster._monsterData;
 	bool monsterDied = false;
 
-	if (!isDarkCc && damage && rangeType && monster._spriteId == 89)
+	if (!isDarkCc && damage && rangeType != RT_SINGLE && monster._spriteId == 89)
 		damage = 0;
 
 	if (!damage) {
@@ -1432,7 +1432,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
 		if (monsterResist > 0) {
 			_pow[_attackDurationCtr]._elemFrame = _attackWeapon->getElementalCategory();
 			_pow[_attackDurationCtr]._elemScale = getDamageScale(monsterResist);
-		} else if (rangeType != 3) {
+		} else if (rangeType != RT_HIT) {
 			_pow[_attackDurationCtr]._elemFrame = 0;
 		}
 
@@ -1441,7 +1441,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
 			monster._effect1 = 0;
 		}
 
-		if (rangeType && monsterSavingThrow(monster._spriteId)) {
+		if (rangeType != RT_SINGLE && monsterSavingThrow(monster._spriteId)) {
 			switch (_damageType) {
 			case DT_FINGEROFDEATH:
 			case DT_MASS_DISTORTION:
@@ -1680,7 +1680,7 @@ void Combat::getWeaponDamage(Character &c, RangeType rangeType) {
 	for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
 		XeenItem &weapon = c._weapons[idx];
 		bool flag;
-		if (rangeType) {
+		if (rangeType != RT_SINGLE) {
 			flag = weapon._frame == 4;
 		} else {
 			flag = weapon._frame == 1 || weapon._frame == 13;
diff --git a/engines/xeen/combat.h b/engines/xeen/combat.h
index e01d4df..f081add 100644
--- a/engines/xeen/combat.h
+++ b/engines/xeen/combat.h
@@ -26,7 +26,6 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "xeen/files.h"
-#include "xeen/item.h"
 #include "xeen/sprites.h"
 
 namespace Xeen {
@@ -71,6 +70,10 @@ enum PowType {
 	POW_SPARKLES = 14, POW_DEADLY_SWARM = 15
 };
 
+enum RangeType {
+	RT_SINGLE = 0, RT_GROUP = 1, RT_ALL = 2, RT_HIT = 3
+};
+
 class XeenEngine;
 class Character;
 class XeenItem;
diff --git a/engines/xeen/item.h b/engines/xeen/item.h
index 6e81004..d951353 100644
--- a/engines/xeen/item.h
+++ b/engines/xeen/item.h
@@ -47,10 +47,6 @@ enum AttributeCategory {
 	ATTR_ARMOR_CLASS = 8, ATTR_THIEVERY = 9
 };
 
-enum RangeType {
-	RT_SINGLE = 0, RT_GROUP = 1, RT_ALL = 2, RT_HIT = 3
-};
-
 enum ElementalCategory {
 	ELEM_FIRE = 0, ELEM_ELECTRICITY = 1, ELEM_COLD = 2, ELEM_ACID_POISON = 3,
 	ELEM_ENERGY = 4, ELEM_MAGIC = 5
@@ -94,8 +90,6 @@ public:
 	 * Gets the attribute category for the item
 	 */
 	AttributeCategory getAttributeCategory() const;
-
-	void getWeaponDamage(Character &c, RangeType rangeType);
 };
 
 class InventoryItems : public Common::Array<XeenItem> {