Merge race and monster type enums

2014-12-03 18:27:34 -05:00
parent efa552a366
commit 5b7649543f
11 changed files with 57 additions and 74 deletions
--- a/osx/classes/monster.h
+++ b/osx/classes/monster.h
@@ -110,7 +110,7 @@ public:
 	unsigned char armor;
 	unsigned char skill;
 	cAttack a[3];
-	eMonsterType m_type;
+	eRace m_type;
 	unsigned char speed;
 	unsigned char mu;
 	unsigned char cl;