diff options
| author | Strangerke | 2016-09-18 11:46:53 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-18 11:46:53 +0200 |
| commit | 0750c20fe7e2d152a7e2b181c455c3d24e653c86 (patch) | |
| tree | f2a54c3aee98c002d9c6ae87811c2863ed1459b3 /engines/dm/group.h | |
| parent | ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c (diff) | |
| download | scummvm-rg350-0750c20fe7e2d152a7e2b181c455c3d24e653c86.tar.gz scummvm-rg350-0750c20fe7e2d152a7e2b181c455c3d24e653c86.tar.bz2 scummvm-rg350-0750c20fe7e2d152a7e2b181c455c3d24e653c86.zip | |
DM: rename members of DescriptionMask, PanelContent, CreatureSize, CreatureMask
Diffstat (limited to 'engines/dm/group.h')
| -rw-r--r-- | engines/dm/group.h | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/engines/dm/group.h b/engines/dm/group.h index 08ce611464..82985a29e6 100644 --- a/engines/dm/group.h +++ b/engines/dm/group.h @@ -66,29 +66,34 @@ enum CreatureType { kDMCreatureTypeLordOrder = 25, // @ C25_CREATURE_LORD_ORDER kDMCreatureTypeGreyLord = 26 // @ C26_CREATURE_GREY_LORD }; + #define k255_CreatureTypeSingleCenteredCreature 255 // @ C255_SINGLE_CENTERED_CREATURE enum CreatureSize { kDMCreatureSizeQuarter = 0, // @ C0_SIZE_QUARTER_SQUARE - k1_MaskCreatureSizeHalf = 1, // @ C1_SIZE_HALF_SQUARE - k2_MaskCreatureSizeFull = 2 // @ C2_SIZE_FULL_SQUARE + kDMCreatureSizeHalf = 1, // @ C1_SIZE_HALF_SQUARE + kDMCreatureSizeFull = 2 // @ C2_SIZE_FULL_SQUARE +}; + +enum CreatureMask { + kDMCreatureMaskSize = 0x0003, // @ MASK0x0003_SIZE + kDMCreatureMaskSideAttack = 0x0004, // @ MASK0x0004_SIDE_ATTACK + kDMCreatureMaskPreferBackRow = 0x0008, // @ MASK0x0008_PREFER_BACK_ROW + kDMCreatureMaskAttackAnyChamp = 0x0010, // @ MASK0x0010_ATTACK_ANY_CHAMPION + kDMCreatureMaskLevitation = 0x0020, // @ MASK0x0020_LEVITATION + kDMCreatureMaskNonMaterial = 0x0040, // @ MASK0x0040_NON_MATERIAL + kDMCreatureMaskDropFixedPoss = 0x0200, // @ MASK0x0200_DROP_FIXED_POSSESSIONS + kDMCreatureMaskKeepThrownSharpWeapon = 0x0400, // @ MASK0x0400_KEEP_THROWN_SHARP_WEAPONS + kDMCreatureMaskSeeInvisible = 0x0800, // @ MASK0x0800_SEE_INVISIBLE + kDMCreatureMaskNightVision = 0x1000, // @ MASK0x1000_NIGHT_VISION + kDMCreatureMaskArchenemy = 0x2000, // @ MASK0x2000_ARCHENEMY + kDMCreatureMaskMagicMap = 0x4000 // @ MASK0x4000_MAGICMAP }; -#define kDMCreatureMaskSize 0x0003 // @ MASK0x0003_SIZE -#define kDMCreatureMaskSideAttack 0x0004 // @ MASK0x0004_SIDE_ATTACK -#define kDMCreatureMaskPreferBackRow 0x0008 // @ MASK0x0008_PREFER_BACK_ROW -#define kDMCreatureMaskAttackAnyChamp 0x0010 // @ MASK0x0010_ATTACK_ANY_CHAMPION -#define kDMCreatureMaskLevitation 0x0020 // @ MASK0x0020_LEVITATION -#define kDMCreatureMaskNonMaterial 0x0040 // @ MASK0x0040_NON_MATERIAL -#define kDMCreatureMaskDropFixedPoss 0x0200 // @ MASK0x0200_DROP_FIXED_POSSESSIONS -#define kDMCreatureMaskKeepThrownSharpWeapon 0x0400 // @ MASK0x0400_KEEP_THROWN_SHARP_WEAPONS -#define kDMCreatureMaskSeeInvisible 0x0800 // @ MASK0x0800_SEE_INVISIBLE -#define kDMCreatureMaskNightVision 0x1000 // @ MASK0x1000_NIGHT_VISION -#define kDMCreatureMaskArchenemy 0x2000 // @ MASK0x2000_ARCHENEMY -#define kDMCreatureMaskMagicMap 0x4000 // @ MASK0x4000_MAGICMAP - -#define k0x0040_MaskActiveGroupFlipBitmap 0x0040 // @ MASK0x0040_FLIP_BITMAP -#define k0x0080_MaskActiveGroupIsAttacking 0x0080 // @ MASK0x0080_IS_ATTACKING +enum aspectMask { + kDMAspectMaskActiveGroupFlipBitmap = 0x0040, // @ MASK0x0040_FLIP_BITMAP + kDMAspectMaskActiveGroupIsAttacking = 0x0080 // @ MASK0x0080_IS_ATTACKING +}; class ActiveGroup { public: |