DM: Some renaming in group

1 files changed, 33 insertions, 32 deletions

diff --git a/engines/dm/group.h b/engines/dm/group.h
index ad68a03216..0b750462c4 100644
--- a/engines/dm/group.h
+++ b/engines/dm/group.h
@@ -35,42 +35,43 @@ namespace DM {
 	class TimelineEvent;
 	class CreatureInfo;
 
-	// this doesn't seem to be used anywhere at all
 /* Creature types */
 enum CreatureType {
-	k0_CreatureTypeGiantScorpionScorpion = 0, // @ C00_CREATURE_GIANT_SCORPION_SCORPION     
-	k1_CreatureTypeSwampSlimeSlime = 1, // @ C01_CREATURE_SWAMP_SLIME_SLIME_DEVIL     
-	k2_CreatureTypeGiggler = 2, // @ C02_CREATURE_GIGGLER                     
-	k3_CreatureTypeWizardEyeFlyingEye = 3, // @ C03_CREATURE_WIZARD_EYE_FLYING_EYE       
-	k4_CreatureTypePainRatHellHound = 4, // @ C04_CREATURE_PAIN_RAT_HELLHOUND          
-	k5_CreatureTypeRuster = 5, // @ C05_CREATURE_RUSTER                      
-	k6_CreatureTypeScreamer = 6, // @ C06_CREATURE_SCREAMER                    
-	k7_CreatureTypeRockpile = 7, // @ C07_CREATURE_ROCK_ROCKPILE               
-	k8_CreatureTypeGhostRive = 8, // @ C08_CREATURE_GHOST_RIVE                  
-	k9_CreatureTypeStoneGolem = 9, // @ C09_CREATURE_STONE_GOLEM                 
-	k10_CreatureTypeMummy = 10, // @ C10_CREATURE_MUMMY                      
-	k11_CreatureTypeBlackFlame = 11, // @ C11_CREATURE_BLACK_FLAME                
-	k12_CreatureTypeSkeleton = 12, // @ C12_CREATURE_SKELETON                   
-	k13_CreatureTypeCouatl = 13, // @ C13_CREATURE_COUATL                     
-	k14_CreatureTypeVexirk = 14, // @ C14_CREATURE_VEXIRK                     
-	k15_CreatureTypeMagnetaWormWorm = 15, // @ C15_CREATURE_MAGENTA_WORM_WORM          
-	k16_CreatureTypeTrolinAntman = 16, // @ C16_CREATURE_TROLIN_ANTMAN              
-	k17_CreatureTypeGiantWaspMuncher = 17, // @ C17_CREATURE_GIANT_WASP_MUNCHER         
-	k18_CreatureTypeAnimatedArmourDethKnight = 18, // @ C18_CREATURE_ANIMATED_ARMOUR_DETH_KNIGHT
-	k19_CreatureTypeMaterializerZytaz = 19, // @ C19_CREATURE_MATERIALIZER_ZYTAZ         
-	k20_CreatureTypeWaterElemental = 20, // @ C20_CREATURE_WATER_ELEMENTAL            
-	k21_CreatureTypeOitu = 21, // @ C21_CREATURE_OITU                       
-	k22_CreatureTypeDemon = 22, // @ C22_CREATURE_DEMON                      
-	k23_CreatureTypeLordChaos = 23, // @ C23_CREATURE_LORD_CHAOS                 
-	k24_CreatureTypeRedDragon = 24, // @ C24_CREATURE_RED_DRAGON                 
-	k25_CreatureTypeLordOrder = 25, // @ C25_CREATURE_LORD_ORDER                 
-	k26_CreatureTypeGreyLord = 26, // @ C26_CREATURE_GREY_LORD                  
-	k255_CreatureTypeSingleCenteredCreature = 255 // @ C255_SINGLE_CENTERED_CREATURE
+	kDMCreatureTypeGiantScorpion = 0, // @ C00_CREATURE_GIANT_SCORPION_SCORPION     
+	kDMCreatureTypeSwampSlime = 1, // @ C01_CREATURE_SWAMP_SLIME_SLIME_DEVIL     
+	kDMCreatureTypeGiggler = 2, // @ C02_CREATURE_GIGGLER                     
+	kDMCreatureTypeWizardEye = 3, // @ C03_CREATURE_WIZARD_EYE_FLYING_EYE       
+	kDMCreatureTypePainRat = 4, // @ C04_CREATURE_PAIN_RAT_HELLHOUND          
+	kDMCreatureTypeRuster = 5, // @ C05_CREATURE_RUSTER                      
+	kDMCreatureTypeScreamer = 6, // @ C06_CREATURE_SCREAMER                    
+	kDMCreatureTypeRockpile = 7, // @ C07_CREATURE_ROCK_ROCKPILE               
+	kDMCreatureTypeGhostRive = 8, // @ C08_CREATURE_GHOST_RIVE                  
+	kDMCreatureTypeStoneGolem = 9, // @ C09_CREATURE_STONE_GOLEM                 
+	kDMCreatureTypeMummy = 10, // @ C10_CREATURE_MUMMY                      
+	kDMCreatureTypeBlackFlame = 11, // @ C11_CREATURE_BLACK_FLAME                
+	kDMCreatureTypeSkeleton = 12, // @ C12_CREATURE_SKELETON                   
+	kDMCreatureTypeCouatl = 13, // @ C13_CREATURE_COUATL                     
+	kDMCreatureTypeVexirk = 14, // @ C14_CREATURE_VEXIRK                     
+	kCreatureTypeMagentaWorm = 15, // @ C15_CREATURE_MAGENTA_WORM_WORM          
+	kDMCreatureTypeAntman = 16, // @ C16_CREATURE_TROLIN_ANTMAN              
+	kDMCreatureTypeGiantWasp = 17, // @ C17_CREATURE_GIANT_WASP_MUNCHER         
+	kDMCreatureTypeAnimatedArmour = 18, // @ C18_CREATURE_ANIMATED_ARMOUR_DETH_KNIGHT
+	kDMCreatureTypeMaterializerZytaz = 19, // @ C19_CREATURE_MATERIALIZER_ZYTAZ         
+	kDMCreatureTypeWaterElemental = 20, // @ C20_CREATURE_WATER_ELEMENTAL            
+	kDMCreatureTypeOitu = 21, // @ C21_CREATURE_OITU                       
+	kDMCreatureTypeDemon = 22, // @ C22_CREATURE_DEMON                      
+	kDMCreatureTypeLordChaos = 23, // @ C23_CREATURE_LORD_CHAOS                 
+	kDMCreatureTypeRedDragon = 24, // @ C24_CREATURE_RED_DRAGON                 
+	kDMCreatureTypeLordOrder = 25, // @ C25_CREATURE_LORD_ORDER                 
+	kDMCreatureTypeGreyLord = 26 // @ C26_CREATURE_GREY_LORD                  
 };
+#define k255_CreatureTypeSingleCenteredCreature 255 // @ C255_SINGLE_CENTERED_CREATURE
 
-#define k0_MaskCreatureSizeQuarter 0 // @ C0_SIZE_QUARTER_SQUARE
-#define k1_MaskCreatureSizeHalf 1 // @ C1_SIZE_HALF_SQUARE   
-#define k2_MaskCreatureSizeFull 2 // @ C2_SIZE_FULL_SQUARE   
+enum CreatureSize {
+	kDMCreatureSizeQuarter = 0, // @ C0_SIZE_QUARTER_SQUARE
+	k1_MaskCreatureSizeHalf = 1, // @ C1_SIZE_HALF_SQUARE   
+	k2_MaskCreatureSizeFull = 2 // @ C2_SIZE_FULL_SQUARE   
+};
 
 #define k0x0003_MaskCreatureInfo_size 0x0003 // @ MASK0x0003_SIZE                     
 #define k0x0004_MaskCreatureInfo_sideAttack 0x0004 // @ MASK0x0004_SIDE_ATTACK