[Scummvm-git-logs] scummvm master -> 326533ab9b3d725afd7fec10d852fa0c2261f8a9

[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:
326533ab9b XEEN: Cleanup of class hates switch


Commit: 326533ab9b3d725afd7fec10d852fa0c2261f8a9
    https://github.com/scummvm/scummvm/commit/326533ab9b3d725afd7fec10d852fa0c2261f8a9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-03T19:31:32-04:00

Commit Message:
XEEN: Cleanup of class hates switch

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


diff --git a/engines/xeen/character.h b/engines/xeen/character.h
index 77e3360..6639d83 100644
--- a/engines/xeen/character.h
+++ b/engines/xeen/character.h
@@ -51,7 +51,11 @@ enum Race { HUMAN = 0, ELF = 1, DWARF = 2, GNOME = 3, HALF_ORC = 4 };
 enum CharacterClass {
 	CLASS_KNIGHT = 0, CLASS_PALADIN = 1, CLASS_ARCHER = 2, CLASS_CLERIC = 3,
 	CLASS_SORCERER = 4, CLASS_ROBBER = 5, CLASS_NINJA = 6, CLASS_BARBARIAN = 7,
-	CLASS_DRUID = 8, CLASS_RANGER = 9, TOTAL_CLASSES = 10, CLASS_12 = 12, CLASS_15 = 15, CLASS_16 = 16
+	CLASS_DRUID = 8, CLASS_RANGER = 9, TOTAL_CLASSES = 10
+};
+
+enum HatesClass {
+	HATES_DWARF = 12, HATES_ALL_CLASSES = 15, HATES_NO_CLASSES = 16
 };
 
 enum Attribute {
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index baff2f1..5f9d761 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -821,7 +821,7 @@ void Combat::doMonsterTurn(int monsterId) {
 		bool isHated = false;
 
 		if (monsterData._hatesClass != -1) {
-			if (monsterData._hatesClass == 15)
+			if (monsterData._hatesClass == HATES_ALL_CLASSES)
 				// Monster hates all classes
 				goto loop;
 
@@ -845,7 +845,7 @@ void Combat::doMonsterTurn(int monsterId) {
 				case CLASS_RANGER:
 					isHated = c._class == monsterData._hatesClass;
 					break;
-				case 12:
+				case HATES_DWARF:
 					isHated = c._race == DWARF;
 					break;
 				default: