DM: More renaming in DungeonMan

7 files changed, 185 insertions, 186 deletions

diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index 050e031e3d..4e7dd9d8cd 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -905,7 +905,7 @@ T0172010_ClosedFakeWall:
 					}
 				} else {
 					aspectArray[AL0310_i_SideIndex + 1] = curSensor->getAttrOrnOrdinal();
-					if (curSensor->getType() == k127_SensorWallChampionPortrait) {
+					if (curSensor->getType() == kDMSensorWallChampionPortrait) {
 						_vm->_displayMan->_championPortraitOrdinal = _vm->indexToOrdinal(curSensor->getData());
 					}
 				}
@@ -1623,29 +1623,29 @@ Thing DungeonMan::getObjForProjectileLaucherOrObjGen(uint16 iconIndex) {
 
 	switch (iconIndex) {
 	case kDMIconIndiceWeaponRock:
-		junkType = k30_WeaponTypeRock;
+		junkType = kDMWeaponRock;
 		break;
 	case kDMIconIndiceJunkBoulder:
 		junkType = k25_JunkTypeBoulder;
 		thingType = kDMThingTypeJunk;
 		break;
 	case kDMIconIndiceWeaponArrow:
-		junkType = k27_WeaponTypeArrow;
+		junkType = kDMWeaponArrow;
 		break;
 	case kDMIconIndiceWeaponSlayer:
-		junkType = k28_WeaponTypeSlayer;
+		junkType = kDMWeaponSlayer;
 		break;
 	case kDMIconIndiceWeaponPoisonDart:
-		junkType = k31_WeaponTypePoisonDart;
+		junkType = kDMWeaponPoisonDart;
 		break;
 	case kDMIconIndiceWeaponThrowingStar:
-		junkType = k32_WeaponTypeThrowingStar;
+		junkType = kDMWeaponThrowingStar;
 		break;
 	case kDMIconIndiceWeaponDagger:
-		junkType = k8_WeaponTypeDagger;
+		junkType = kDMWeaponDagger;
 		break;
 	case kDMIconIndiceWeaponTorchUnlit:
-		junkType = k2_WeaponTypeTorch;
+		junkType = kDMWeaponTorch;
 		break;
 	default:
 		return Thing::_none;
diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
index c3176a5f85..822ea4385c 100644
--- a/engines/dm/dungeonman.h
+++ b/engines/dm/dungeonman.h
@@ -73,7 +73,8 @@ enum ObjectAllowedSlot {
 	kDMMaskPouchPassAndThroughDoors = 0x0100, // @ MASK0x0100_POUCH_PASS_AND_THROUGH_DOORS
 	kDMMaskHands = 0x0200, // @ MASK0x0200_HANDS
 	kDMMaskContainer = 0x0400, // @ MASK0x0400_CONTAINER
-	kDMMaskFootprints = 0x8000 // @ MASK0x8000_FOOTPRINTS
+	kDMMaskFootprints = 0x8000, // @ MASK0x8000_FOOTPRINTS
+	kDMMaskRandomDrop = 0x8000 // @ MASK0x8000_RANDOM_DROP
 };
 
 enum ArmourAttribute {
@@ -122,77 +123,75 @@ enum SquareAspect {
 	kDMSquareAspectFloorOrn = 4 // @ C4_FLOOR_ORNAMENT_ORDINAL
 };
 
-#define k15_immuneToFire 15 // @ C15_IMMUNE_TO_FIRE
-#define k15_immuneToPoison 15 // @ C15_IMMUNE_TO_POISON
+#define kDMImmuneToFire 15 // @ C15_IMMUNE_TO_FIRE
+#define kDMImmuneToPoison 15 // @ C15_IMMUNE_TO_POISON
 
 enum TeleporterScope {
-	k0x0001_TelepScopeCreatures = 1, // @ MASK0x0001_SCOPE_CREATURES
-	k0x0002_TelepScopeObjOrParty = 2 // @ MASK0x0002_SCOPE_OBJECTS_OR_PARTY
+	kDMTeleporterScopeCreatures = 1, // @ MASK0x0001_SCOPE_CREATURES
+	kDMTeleporterScopeObjectsOrParty = 2 // @ MASK0x0002_SCOPE_OBJECTS_OR_PARTY
 };
 
-enum SensorActionType {
-	kM1_SensorEffNone = -1, // @ CM1_EFFECT_NONE
-	k0_SensorEffSet = 0, // @ C00_EFFECT_SET
-	k1_SensorEffClear = 1, // @ C01_EFFECT_CLEAR
-	k2_SensorEffToggle = 2, // @ C02_EFFECT_TOGGLE
-	k3_SensorEffHold = 3, // @ C03_EFFECT_HOLD
-	k10_SensorEffAddExp = 10 // @ C10_EFFECT_ADD_EXPERIENCE
+enum SensorEffect {
+	kDMSensorEffectNone = -1, // @ CM1_EFFECT_NONE
+	kDMSensorEffectSet = 0, // @ C00_EFFECT_SET
+	kDMSensorEffectClear = 1, // @ C01_EFFECT_CLEAR
+	kDMSensorEffectToggle = 2, // @ C02_EFFECT_TOGGLE
+	kDMSensorEffectHold = 3, // @ C03_EFFECT_HOLD
+	kDMSensorEffectAddExperience = 10 // @ C10_EFFECT_ADD_EXPERIENCE
 };
 
 enum SensorType {
-	k0_SensorDisabled = 0, // @ C000_SENSOR_DISABLED    /* Never triggered, may be used for a floor or wall ornament */
-	k1_SensorFloorTheronPartyCreatureObj = 1, // @ C001_SENSOR_FLOOR_THERON_PARTY_CREATURE_OBJECT    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k2_SensorFloorTheronPartyCreature = 2, // @ C002_SENSOR_FLOOR_THERON_PARTY_CREATURE    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k3_SensorFloorParty = 3, // @ C003_SENSOR_FLOOR_PARTY    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k4_SensorFloorObj = 4, // @ C004_SENSOR_FLOOR_OBJECT    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k5_SensorFloorPartyOnStairs = 5, // @ C005_SENSOR_FLOOR_PARTY_ON_STAIRS    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k6_SensorFloorGroupGenerator = 6, // @ C006_SENSOR_FLOOR_GROUP_GENERATOR    /* Triggered by event F0245_TIMELINE_ProcessEvent5_Square_Corridor */
-	k7_SensorFloorCreature = 7, // @ C007_SENSOR_FLOOR_CREATURE    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k8_SensorFloorPartyPossession = 8, // @ C008_SENSOR_FLOOR_PARTY_POSSESSION    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k9_SensorFloorVersionChecker = 9, // @ C009_SENSOR_FLOOR_VERSION_CHECKER    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
-	k1_SensorWallOrnClick = 1, // @ C001_SENSOR_WALL_ORNAMENT_CLICK    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k2_SensorWallOrnClickWithAnyObj = 2, // @ C002_SENSOR_WALL_ORNAMENT_CLICK_WITH_ANY_OBJECT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k3_SensorWallOrnClickWithSpecObj = 3, // @ C003_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k4_SensorWallOrnClickWithSpecObjRemoved = 4, // @ C004_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k5_SensorWallAndOrGate = 5, // @ C005_SENSOR_WALL_AND_OR_GATE    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k6_SensorWallCountdown = 6, // @ C006_SENSOR_WALL_COUNTDOWN    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k7_SensorWallSingleProjLauncherNewObj = 7, // @ C007_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_NEW_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k8_SensorWallSingleProjLauncherExplosion = 8, // @ C008_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_EXPLOSION    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k9_SensorWallDoubleProjLauncherNewObj = 9, // @ C009_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_NEW_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k10_SensorWallDoubleProjLauncherExplosion = 10, // @ C010_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_EXPLOSION    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k11_SensorWallOrnClickWithSpecObjRemovedRotateSensors = 11, // @ C011_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED_ROTATE_SENSORS   /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k12_SensorWallObjGeneratorRotateSensors = 12, // @ C012_SENSOR_WALL_OBJECT_GENERATOR_ROTATE_SENSORS    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k13_SensorWallSingleObjStorageRotateSensors = 13, // @ C013_SENSOR_WALL_SINGLE_OBJECT_STORAGE_ROTATE_SENSORS    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k14_SensorWallSingleProjLauncherSquareObj = 14, // @ C014_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_SQUARE_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k15_SensorWallDoubleProjLauncherSquareObj = 15, // @ C015_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_SQUARE_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k16_SensorWallObjExchanger = 16, // @ C016_SENSOR_WALL_OBJECT_EXCHANGER    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k17_SensorWallOrnClickWithSpecObjRemovedSensor = 17, // @ C017_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED_REMOVE_SENSOR    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
-	k18_SensorWallEndGame = 18, // @ C018_SENSOR_WALL_END_GAME    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
-	k127_SensorWallChampionPortrait = 127 // @ C127_SENSOR_WALL_CHAMPION_PORTRAIT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorDisabled = 0, // @ C000_SENSOR_DISABLED    /* Never triggered, may be used for a floor or wall ornament */
+	kDMSensorFloorTheronPartyCreatureObj = 1, // @ C001_SENSOR_FLOOR_THERON_PARTY_CREATURE_OBJECT    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorTheronPartyCreature = 2, // @ C002_SENSOR_FLOOR_THERON_PARTY_CREATURE    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorParty = 3, // @ C003_SENSOR_FLOOR_PARTY    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorObj = 4, // @ C004_SENSOR_FLOOR_OBJECT    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorPartyOnStairs = 5, // @ C005_SENSOR_FLOOR_PARTY_ON_STAIRS    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorGroupGenerator = 6, // @ C006_SENSOR_FLOOR_GROUP_GENERATOR    /* Triggered by event F0245_TIMELINE_ProcessEvent5_Square_Corridor */
+	kDMSensorFloorCreature = 7, // @ C007_SENSOR_FLOOR_CREATURE    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorPartyPossession = 8, // @ C008_SENSOR_FLOOR_PARTY_POSSESSION    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorFloorVersionChecker = 9, // @ C009_SENSOR_FLOOR_VERSION_CHECKER    /* Triggered by party/thing F0276_SENSOR_ProcessThingAdditionOrRemoval */
+	kDMSensorWallOrnClick = 1, // @ C001_SENSOR_WALL_ORNAMENT_CLICK    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallOrnClickWithAnyObj = 2, // @ C002_SENSOR_WALL_ORNAMENT_CLICK_WITH_ANY_OBJECT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallOrnClickWithSpecObj = 3, // @ C003_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallOrnClickWithSpecObjRemoved = 4, // @ C004_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallAndOrGate = 5, // @ C005_SENSOR_WALL_AND_OR_GATE    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallCountdown = 6, // @ C006_SENSOR_WALL_COUNTDOWN    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallSingleProjLauncherNewObj = 7, // @ C007_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_NEW_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallSingleProjLauncherExplosion = 8, // @ C008_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_EXPLOSION    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallDoubleProjLauncherNewObj = 9, // @ C009_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_NEW_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallDoubleProjLauncherExplosion = 10, // @ C010_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_EXPLOSION    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallOrnClickWithSpecObjRemovedRotateSensors = 11, // @ C011_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED_ROTATE_SENSORS   /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallObjGeneratorRotateSensors = 12, // @ C012_SENSOR_WALL_OBJECT_GENERATOR_ROTATE_SENSORS    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallSingleObjStorageRotateSensors = 13, // @ C013_SENSOR_WALL_SINGLE_OBJECT_STORAGE_ROTATE_SENSORS    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallSingleProjLauncherSquareObj = 14, // @ C014_SENSOR_WALL_SINGLE_PROJECTILE_LAUNCHER_SQUARE_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallDoubleProjLauncherSquareObj = 15, // @ C015_SENSOR_WALL_DOUBLE_PROJECTILE_LAUNCHER_SQUARE_OBJECT    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallObjExchanger = 16, // @ C016_SENSOR_WALL_OBJECT_EXCHANGER    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallOrnClickWithSpecObjRemovedSensor = 17, // @ C017_SENSOR_WALL_ORNAMENT_CLICK_WITH_SPECIFIC_OBJECT_REMOVED_REMOVE_SENSOR    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
+	kDMSensorWallEndGame = 18, // @ C018_SENSOR_WALL_END_GAME    /* Triggered by event F0248_TIMELINE_ProcessEvent6_Square_Wall */
+	kDMSensorWallChampionPortrait = 127 // @ C127_SENSOR_WALL_CHAMPION_PORTRAIT    /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
 };
 
-#define k0x8000_randomDrop 0x8000 // @ MASK0x8000_RANDOM_DROP
-
 enum WeaponType {
-	k2_WeaponTypeTorch = 2, // @ C02_WEAPON_TORCH
-	k8_WeaponTypeDagger = 8, // @ C08_WEAPON_DAGGER
-	k9_WeaponTypeFalchion = 9, // @ C09_WEAPON_FALCHION
-	k10_WeaponTypeSword = 10, // @ C10_WEAPON_SWORD
-	k23_WeaponTypeClub = 23, // @ C23_WEAPON_CLUB
-	k24_WeaponTypeStoneClub = 24, // @ C24_WEAPON_STONE_CLUB
-	k27_WeaponTypeArrow = 27, // @ C27_WEAPON_ARROW
-	k28_WeaponTypeSlayer = 28, // @ C28_WEAPON_SLAYER
-	k30_WeaponTypeRock = 30, // @ C30_WEAPON_ROCK
-	k31_WeaponTypePoisonDart = 31, // @ C31_WEAPON_POISON_DART
-	k32_WeaponTypeThrowingStar = 32 // @ C32_WEAPON_THROWING_STAR
+	kDMWeaponTorch = 2, // @ C02_WEAPON_TORCH
+	kDMWeaponDagger = 8, // @ C08_WEAPON_DAGGER
+	kDMWeaponFalchion = 9, // @ C09_WEAPON_FALCHION
+	kDMWeaponSword = 10, // @ C10_WEAPON_SWORD
+	kDMWeaponClub = 23, // @ C23_WEAPON_CLUB
+	kDMWeaponStoneClub = 24, // @ C24_WEAPON_STONE_CLUB
+	kDMWeaponArrow = 27, // @ C27_WEAPON_ARROW
+	kDMWeaponSlayer = 28, // @ C28_WEAPON_SLAYER
+	kDMWeaponRock = 30, // @ C30_WEAPON_ROCK
+	kDMWeaponPoisonDart = 31, // @ C31_WEAPON_POISON_DART
+	kDMWeaponThrowingStar = 32 // @ C32_WEAPON_THROWING_STAR
 };
 
 enum ArmourType {
-	k30_ArmourTypeWoodenShield = 30, // @ C30_ARMOUR_WOODEN_SHIELD
-	k38_ArmourTypeArmet = 38, // @ C38_ARMOUR_ARMET
-	k39_ArmourTypeTorsoPlate = 39, // @ C39_ARMOUR_TORSO_PLATE
-	k40_ArmourTypeLegPlate = 40, // @ C40_ARMOUR_LEG_PLATE
-	k41_ArmourTypeFootPlate = 41 // @ C41_ARMOUR_FOOT_PLATE
+	kDMArmourWoodenShield = 30, // @ C30_ARMOUR_WOODEN_SHIELD
+	kDMArmourArmet = 38, // @ C38_ARMOUR_ARMET
+	kDMArmourTorsoPlate = 39, // @ C39_ARMOUR_TORSO_PLATE
+	kDMArmourLegPlate = 40, // @ C40_ARMOUR_LEG_PLATE
+	kDMArmourFootPlate = 41 // @ C41_ARMOUR_FOOT_PLATE
 };
 
 enum PotionType {
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index 56b66eeeea..6f834d3c19 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -1175,7 +1175,7 @@ void EventManager::commandProcessType80ClickInDungeonView(int16 posX, int16 posY
 			if ((((Door*)junkPtr)->hasButton()) && _vm->_dungeonMan->_dungeonViewClickableBoxes[k5_ViewCellDoorButtonOrWallOrn].isPointInside(posX, posY - 33)) {
 				_vm->_stopWaitingForPlayerInput = true;
 				_vm->_sound->requestPlay(k01_soundSWITCH, _vm->_dungeonMan->_partyMapX, _vm->_dungeonMan->_partyMapY, k1_soundModePlayIfPrioritized);
-				_vm->_moveSens->addEvent(k10_TMEventTypeDoor, L1155_i_MapX, L1156_i_MapY, 0, k2_SensorEffToggle, _vm->_gameTime + 1);
+				_vm->_moveSens->addEvent(k10_TMEventTypeDoor, L1155_i_MapX, L1156_i_MapY, 0, kDMSensorEffectToggle, _vm->_gameTime + 1);
 				return;
 			}
 		} else if (isLeaderHandObjThrown(posX, posY))
@@ -1403,7 +1403,7 @@ void EventManager::processType80_clickInDungeonViewDropLeaderHandObject(uint16 v
 		newEvent._Bu._location._mapX = mapX;
 		newEvent._Bu._location._mapY = mapY;
 		newEvent._Cu.A._cell = currCell;
-		newEvent._Cu.A._effect = k2_SensorEffToggle;
+		newEvent._Cu.A._effect = kDMSensorEffectToggle;
 		_vm->_timeline->addEventGetEventIndex(&newEvent);
 	}
 	_vm->_stopWaitingForPlayerInput = true;
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index e2d5fa36d3..9e7335ca28 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -169,48 +169,48 @@ void GroupMan::dropGroupPossessions(int16 mapX, int16 mapY, Thing groupThing, in
 
 void GroupMan::dropCreatureFixedPossessions(uint16 creatureType, int16 mapX, int16 mapY, uint16 cell, int16 mode) {
 	static uint16 fixedPossessionCreature12Skeleton[3] = { // @ G0245_aui_Graphic559_FixedPossessionsCreature12Skeleton
-		kDMObjectInfoIndexFirstWeapon + k9_WeaponTypeFalchion,
-		kDMObjectInfoIndexFirstArmour + k30_ArmourTypeWoodenShield,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponFalchion,
+		kDMObjectInfoIndexFirstArmour + kDMArmourWoodenShield,
 		0}
 	;
 	static uint16 fixedPossessionCreature9StoneGolem[2] = { // @ G0246_aui_Graphic559_FixedPossessionsCreature09StoneGolem
-		kDMObjectInfoIndexFirstWeapon + k24_WeaponTypeStoneClub,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponStoneClub,
 		0
 	};
 	static uint16 fixedPossessionCreatur16TrolinAntman[2] = { // @ G0247_aui_Graphic559_FixedPossessionsCreature16Trolin_Antman
-		kDMObjectInfoIndexFirstWeapon + k23_WeaponTypeClub,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponClub,
 		0
 	};
 	static uint16 fixedPossessionCreature18AnimatedArmourDethKnight[7] = { // @ G0248_aui_Graphic559_FixedPossessionsCreature18AnimatedArmour_DethKnight
-		kDMObjectInfoIndexFirstArmour + k41_ArmourTypeFootPlate,
-		kDMObjectInfoIndexFirstArmour + k40_ArmourTypeLegPlate,
-		kDMObjectInfoIndexFirstArmour + k39_ArmourTypeTorsoPlate,
-		kDMObjectInfoIndexFirstWeapon + k10_WeaponTypeSword,
-		kDMObjectInfoIndexFirstArmour + k38_ArmourTypeArmet,
-		kDMObjectInfoIndexFirstWeapon + k10_WeaponTypeSword,
+		kDMObjectInfoIndexFirstArmour + kDMArmourFootPlate,
+		kDMObjectInfoIndexFirstArmour + kDMArmourLegPlate,
+		kDMObjectInfoIndexFirstArmour + kDMArmourTorsoPlate,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponSword,
+		kDMObjectInfoIndexFirstArmour + kDMArmourArmet,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponSword,
 		0
 	};
 	static uint16 fixedPossessionCreature7rockRockPile[5] = { // @ G0249_aui_Graphic559_FixedPossessionsCreature07Rock_RockPile
 		kDMObjectInfoIndexFirstJunk + k25_JunkTypeBoulder,
-		kDMObjectInfoIndexFirstJunk + k25_JunkTypeBoulder | k0x8000_randomDrop,
-		kDMObjectInfoIndexFirstWeapon + k30_WeaponTypeRock | k0x8000_randomDrop,
-		kDMObjectInfoIndexFirstWeapon + k30_WeaponTypeRock | k0x8000_randomDrop,
+		kDMObjectInfoIndexFirstJunk + k25_JunkTypeBoulder | kDMMaskRandomDrop,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponRock | kDMMaskRandomDrop,
+		kDMObjectInfoIndexFirstWeapon + kDMWeaponRock | kDMMaskRandomDrop,
 		0
 	};
 	static uint16 fixedPossessionCreature4PainRatHellHound[3] = { // @ G0250_aui_Graphic559_FixedPossessionsCreature04PainRat_Hellhound
 		kDMObjectInfoIndexFirstJunk + k35_JunkTypeDrumstickShank,
-		kDMObjectInfoIndexFirstJunk + k35_JunkTypeDrumstickShank | k0x8000_randomDrop,
+		kDMObjectInfoIndexFirstJunk + k35_JunkTypeDrumstickShank | kDMMaskRandomDrop,
 		0
 	};
 	static uint16 fixedPossessionCreature6screamer[3] = { // @ G0251_aui_Graphic559_FixedPossessionsCreature06Screamer
 		kDMObjectInfoIndexFirstJunk + k33_JunkTypeScreamerSlice,
-		kDMObjectInfoIndexFirstJunk + k33_JunkTypeScreamerSlice | k0x8000_randomDrop,
+		kDMObjectInfoIndexFirstJunk + k33_JunkTypeScreamerSlice | kDMMaskRandomDrop,
 		0
 	};
 	static uint16 fixedPossessionCreature15MagnetaWormWorm[4] = { // @ G0252_aui_Graphic559_FixedPossessionsCreature15MagentaWorm_Worm
 		kDMObjectInfoIndexFirstJunk + k34_JunkTypeWormRound,
-		kDMObjectInfoIndexFirstJunk + k34_JunkTypeWormRound | k0x8000_randomDrop,
-		kDMObjectInfoIndexFirstJunk + k34_JunkTypeWormRound | k0x8000_randomDrop,
+		kDMObjectInfoIndexFirstJunk + k34_JunkTypeWormRound | kDMMaskRandomDrop,
+		kDMObjectInfoIndexFirstJunk + k34_JunkTypeWormRound | kDMMaskRandomDrop,
 		0
 	};
 	static uint16 fixedPossessionCreature24RedDragon[11] = { // @ G0253_aui_Graphic559_FixedPossessionsCreature24RedDragon
@@ -222,8 +222,8 @@ void GroupMan::dropCreatureFixedPossessions(uint16 creatureType, int16 mapX, int
 		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak,
 		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak,
 		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak,
-		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak | k0x8000_randomDrop,
-		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak | k0x8000_randomDrop, 0};
+		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak | kDMMaskRandomDrop,
+		kDMObjectInfoIndexFirstJunk + k36_JunkTypeDragonSteak | kDMMaskRandomDrop, 0};
 
 	uint16 *fixedPossessions;
 	bool cursedPossessions = false;
@@ -263,11 +263,11 @@ void GroupMan::dropCreatureFixedPossessions(uint16 creatureType, int16 mapX, int
 	uint16 currFixedPossession = *fixedPossessions++;
 	bool weaponDropped = false;
 	while (currFixedPossession) {
-		if (getFlag(currFixedPossession, k0x8000_randomDrop) && _vm->getRandomNumber(2))
+		if (getFlag(currFixedPossession, kDMMaskRandomDrop) && _vm->getRandomNumber(2))
 			continue;
 
 		int16 currThingType;
-		if (clearFlag(currFixedPossession, k0x8000_randomDrop) >= kDMObjectInfoIndexFirstJunk) {
+		if (clearFlag(currFixedPossession, kDMMaskRandomDrop) >= kDMObjectInfoIndexFirstJunk) {
 			currThingType = kDMThingTypeJunk;
 			currFixedPossession -= kDMObjectInfoIndexFirstJunk;
 		} else if (currFixedPossession >= kDMObjectInfoIndexFirstArmour) {
@@ -547,7 +547,7 @@ int16 GroupMan::getDamageAllCreaturesOutcome(Group *group, int16 mapX, int16 map
 int16 GroupMan::groupGetResistanceAdjustedPoisonAttack(uint16 creatreType, int16 poisonAttack) {
 	int16 poisonResistance = _vm->_dungeonMan->_creatureInfos[creatreType].getPoisonResistance();
 
-	if (!poisonAttack || (poisonResistance == k15_immuneToPoison))
+	if (!poisonAttack || (poisonResistance == kDMImmuneToPoison))
 		return 0;
 
 	return ((poisonAttack + _vm->getRandomNumber(4)) << 3) / (poisonResistance + 1);
@@ -1094,7 +1094,7 @@ bool GroupMan::isMovementPossible(CreatureInfo *creatureInfo, int16 mapX, int16
 	}
 	if ((curSquareType == kDMElementTypeTeleporter) && getFlag(curSquare, k0x0008_TeleporterOpen) && (creatureInfo->getWariness() >= 10)) {
 		Teleporter *curTeleporter = (Teleporter *)_vm->_dungeonMan->getSquareFirstThingData(mapX, mapY);
-		if (getFlag(curTeleporter->getScope(), k0x0001_TelepScopeCreatures) && !_vm->_dungeonMan->isCreatureAllowedOnMap(_currGroupThing, curTeleporter->getTargetMapIndex())) {
+		if (getFlag(curTeleporter->getScope(), kDMTeleporterScopeCreatures) && !_vm->_dungeonMan->isCreatureAllowedOnMap(_currGroupThing, curTeleporter->getTargetMapIndex())) {
 			_groupMovBlockedByWallStairsPitFakeWalFluxCageTeleporter = true;
 			return false;
 		}
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index 326affc907..7445819531 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -79,10 +79,10 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 			sensorCountToProcessPerCell[cellIdx]--;
 			Sensor *currentSensor = (Sensor *)_vm->_dungeonMan->getThingData(thingBeingProcessed);
 			SensorType processedSensorType = currentSensor->getType();
-			if (processedSensorType == k0_SensorDisabled)
+			if (processedSensorType == kDMSensorDisabled)
 				continue;
 
-			if ((_vm->_championMan->_leaderIndex == kDMChampionNone) && (processedSensorType != k127_SensorWallChampionPortrait))
+			if ((_vm->_championMan->_leaderIndex == kDMChampionNone) && (processedSensorType != kDMSensorWallChampionPortrait))
 				continue;
 
 			if (cellIdx != cellParam)
@@ -96,23 +96,23 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 			sensorEffect = currentSensor->getAttrEffectA();
 
 			switch (processedSensorType) {
-			case k1_SensorWallOrnClick:
+			case kDMSensorWallOrnClick:
 				doNotTriggerSensor = false;
-				if (currentSensor->getAttrEffectA() == k3_SensorEffHold)
+				if (currentSensor->getAttrEffectA() == kDMSensorEffectHold)
 					continue;
 				break;
-			case k2_SensorWallOrnClickWithAnyObj:
+			case kDMSensorWallOrnClickWithAnyObj:
 				doNotTriggerSensor = (_vm->_championMan->_leaderEmptyHanded != currentSensor->getAttrRevertEffectA());
 				break;
-			case k17_SensorWallOrnClickWithSpecObjRemovedSensor:
-			case k11_SensorWallOrnClickWithSpecObjRemovedRotateSensors:
+			case kDMSensorWallOrnClickWithSpecObjRemovedSensor:
+			case kDMSensorWallOrnClickWithSpecObjRemovedRotateSensors:
 				if (sensorCountToProcessPerCell[cellIdx]) /* If the sensor is not the last one of its type on the cell */
 					continue;
 				// No break on purpose
-			case k3_SensorWallOrnClickWithSpecObj:
-			case k4_SensorWallOrnClickWithSpecObjRemoved:
+			case kDMSensorWallOrnClickWithSpecObj:
+			case kDMSensorWallOrnClickWithSpecObjRemoved:
 				doNotTriggerSensor = ((sensorData == _vm->_objectMan->getObjectType(leaderHandObject)) == currentSensor->getAttrRevertEffectA());
-				if (!doNotTriggerSensor && (processedSensorType == k17_SensorWallOrnClickWithSpecObjRemovedSensor)) {
+				if (!doNotTriggerSensor && (processedSensorType == kDMSensorWallOrnClickWithSpecObjRemovedSensor)) {
 					if (lastProcessedThing == thingBeingProcessed) /* If the sensor is the only one of its type on the cell */
 						break;
 					Sensor *lastSensor = (Sensor *)_vm->_dungeonMan->getThingData(lastProcessedThing);
@@ -121,19 +121,19 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 					thingBeingProcessed = lastProcessedThing;
 				}
 
-				if (!doNotTriggerSensor && (processedSensorType == k11_SensorWallOrnClickWithSpecObjRemovedRotateSensors))
-					triggerLocalEffect(k2_SensorEffToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
+				if (!doNotTriggerSensor && (processedSensorType == kDMSensorWallOrnClickWithSpecObjRemovedRotateSensors))
+					triggerLocalEffect(kDMSensorEffectToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
 
 				break;
-			case k12_SensorWallObjGeneratorRotateSensors:
+			case kDMSensorWallObjGeneratorRotateSensors:
 				if (sensorCountToProcessPerCell[cellIdx]) /* If the sensor is not the last one of its type on the cell */
 					continue;
 
 				doNotTriggerSensor = !_vm->_championMan->_leaderEmptyHanded;
 				if (!doNotTriggerSensor)
-					triggerLocalEffect(k2_SensorEffToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
+					triggerLocalEffect(kDMSensorEffectToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
 				break;
-			case k13_SensorWallSingleObjStorageRotateSensors:
+			case kDMSensorWallSingleObjStorageRotateSensors:
 				if (_vm->_championMan->_leaderEmptyHanded) {
 					leaderHandObject = getObjectOfTypeInCell(mapX, mapY, cellIdx, sensorData);
 					if (leaderHandObject == Thing::_none)
@@ -149,14 +149,14 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 					_vm->_dungeonMan->linkThingToList(_vm->thingWithNewCell(leaderHandObject, cellIdx), Thing(0), mapX, mapY);
 					leaderHandObject = Thing::_none;
 				}
-				triggerLocalEffect(k2_SensorEffToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
-				if ((sensorEffect == k3_SensorEffHold) && !_vm->_championMan->_leaderEmptyHanded)
+				triggerLocalEffect(kDMSensorEffectToggle, mapX, mapY, cellIdx); /* This will cause a rotation of the sensors at the specified cell on the specified square after all sensors have been processed */
+				if ((sensorEffect == kDMSensorEffectHold) && !_vm->_championMan->_leaderEmptyHanded)
 					doNotTriggerSensor = true;
 				else
 					doNotTriggerSensor = false;
 
 				break;
-			case k16_SensorWallObjExchanger: {
+			case kDMSensorWallObjExchanger: {
 				if (sensorCountToProcessPerCell[cellIdx]) /* If the sensor is not the last one of its type on the cell */
 					continue;
 
@@ -171,7 +171,7 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 				doNotTriggerSensor = false;
 				}
 				break;
-			case k127_SensorWallChampionPortrait:
+			case kDMSensorWallChampionPortrait:
 				_vm->_championMan->addCandidateChampionToParty(sensorData);
 				continue;
 				break;
@@ -180,8 +180,8 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 				break;
 			}
 
-			if (sensorEffect == k3_SensorEffHold) {
-				sensorEffect = doNotTriggerSensor ? k1_SensorEffClear : k0_SensorEffSet;
+			if (sensorEffect == kDMSensorEffectHold) {
+				sensorEffect = doNotTriggerSensor ? kDMSensorEffectClear : kDMSensorEffectSet;
 				doNotTriggerSensor = false;
 			}
 			if (!doNotTriggerSensor) {
@@ -189,13 +189,13 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
 				if (currentSensor->getAttrAudibleA())
 					_vm->_sound->requestPlay(k01_soundSWITCH, _vm->_dungeonMan->_partyMapX, _vm->_dungeonMan->_partyMapY, k1_soundModePlayIfPrioritized);
 
-				if (!_vm->_championMan->_leaderEmptyHanded && ((processedSensorType == k4_SensorWallOrnClickWithSpecObjRemoved) || (processedSensorType == k11_SensorWallOrnClickWithSpecObjRemovedRotateSensors) || (processedSensorType == k17_SensorWallOrnClickWithSpecObjRemovedSensor))) {
+				if (!_vm->_championMan->_leaderEmptyHanded && ((processedSensorType == kDMSensorWallOrnClickWithSpecObjRemoved) || (processedSensorType == kDMSensorWallOrnClickWithSpecObjRemovedRotateSensors) || (processedSensorType == kDMSensorWallOrnClickWithSpecObjRemovedSensor))) {
 					Thing *leaderThing = (Thing *)_vm->_dungeonMan->getThingData(leaderHandObject);
 					*leaderThing = Thing::_none;
 					_vm->_championMan->getObjectRemovedFromLeaderHand();
 					leaderHandObject = Thing::_none;
 				} else if (_vm->_championMan->_leaderEmptyHanded
-					&& (processedSensorType == k12_SensorWallObjGeneratorRotateSensors)) {
+					&& (processedSensorType == kDMSensorWallObjGeneratorRotateSensors)) {
 					leaderHandObject = _vm->_dungeonMan->getObjForProjectileLaucherOrObjGen(sensorData);
 					if (leaderHandObject != Thing::_none)
 						_vm->_championMan->putObjectInLeaderHand(leaderHandObject, true);
@@ -246,13 +246,13 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
 		if (thing == Thing::_party) {
 			_vm->_dungeonMan->_partyMapX = destMapX;
 			_vm->_dungeonMan->_partyMapY = destMapY;
-			requiredTeleporterScope = k0x0002_TelepScopeObjOrParty;
+			requiredTeleporterScope = kDMTeleporterScopeObjectsOrParty;
 			drawDungeonViewWhileFalling = !_vm->_inventoryMan->_inventoryChampionOrdinal && !_vm->_championMan->_partyIsSleeping;
 			direction = _vm->_dungeonMan->_partyDir;
 		} else if (thingType == kDMThingTypeGroup)
-			requiredTeleporterScope = k0x0001_TelepScopeCreatures;
+			requiredTeleporterScope = kDMTeleporterScopeCreatures;
 		else
-			requiredTeleporterScope = (k0x0001_TelepScopeCreatures | k0x0002_TelepScopeObjOrParty);
+			requiredTeleporterScope = (kDMTeleporterScopeCreatures | kDMTeleporterScopeObjectsOrParty);
 
 		if (thingType == kDMThingTypeProjectile) {
 			Teleporter *L0712_ps_Teleporter = (Teleporter *)_vm->_dungeonMan->getThingData(thing);
@@ -269,10 +269,10 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
 					break;
 
 				Teleporter *teleporter = (Teleporter *)_vm->_dungeonMan->getSquareFirstThingData(destMapX, destMapY);
-				if ((teleporter->getScope() == k0x0001_TelepScopeCreatures) && (thingType != kDMThingTypeGroup))
+				if ((teleporter->getScope() == kDMTeleporterScopeCreatures) && (thingType != kDMThingTypeGroup))
 					break;
 
-				if ((requiredTeleporterScope != (k0x0001_TelepScopeCreatures | k0x0002_TelepScopeObjOrParty)) && !getFlag(teleporter->getScope(), requiredTeleporterScope))
+				if ((requiredTeleporterScope != (kDMTeleporterScopeCreatures | kDMTeleporterScopeObjectsOrParty)) && !getFlag(teleporter->getScope(), requiredTeleporterScope))
 					break;
 
 				destinationIsTeleporterTarget = (destMapX == teleporter->getTargetMapX()) && (destMapY == teleporter->getTargetMapY()) && (mapIndexDestination == teleporter->getTargetMapIndex());
@@ -754,22 +754,22 @@ void MovesensMan::processThingAdditionOrRemoval(uint16 mapX, uint16 mapY, Thing
 		uint16 curThingType = curThing.getType();
 		if (curThingType == kDMThingTypeSensor) {
 			Sensor *curSensor = (Sensor *)_vm->_dungeonMan->getThingData(curThing);
-			if (curSensor->getType() == k0_SensorDisabled)
+			if (curSensor->getType() == kDMSensorDisabled)
 				continue;
 
 			int16 curSensorData = curSensor->getData();
 			bool triggerSensor = addThing;
 			if (sensorTriggeredCell == kDMCellAny) {
 				switch (curSensor->getType()) {
-				case k1_SensorFloorTheronPartyCreatureObj:
+				case kDMSensorFloorTheronPartyCreatureObj:
 					if (partySquare || squareContainsObject || squareContainsGroup) /* BUG0_30 A floor sensor is not triggered when you put an object on the floor if a levitating creature is present on the same square. The condition to determine if the sensor should be triggered checks if there is a creature on the square but does not check whether the creature is levitating. While it is normal not to trigger the sensor if there is a non levitating creature on the square (because it was already triggered by the creature itself), a levitating creature should not prevent triggering the sensor with an object. */
 						continue;
 					break;
-				case k2_SensorFloorTheronPartyCreature:
+				case kDMSensorFloorTheronPartyCreature:
 					if ((thingType > kDMThingTypeGroup) || partySquare || squareContainsGroup)
 						continue;
 					break;
-				case k3_SensorFloorParty:
+				case kDMSensorFloorParty:
 					if ((thingType != kDMThingTypeParty) || (_vm->_championMan->_partyChampionCount == 0))
 						continue;
 
@@ -781,28 +781,28 @@ void MovesensMan::processThingAdditionOrRemoval(uint16 mapX, uint16 mapY, Thing
 					else
 						triggerSensor = (curSensorData == _vm->indexToOrdinal(_vm->_dungeonMan->_partyDir));
 					break;
-				case k4_SensorFloorObj:
+				case kDMSensorFloorObj:
 					if ((curSensorData != _vm->_objectMan->getObjectType(thing)) || squareContainsThingOfSameType)
 						continue;
 					break;
-				case k5_SensorFloorPartyOnStairs:
+				case kDMSensorFloorPartyOnStairs:
 					if ((thingType != kDMThingTypeParty) || (curSquare.getType() != k3_StairsElemType))
 						continue;
 					break;
-				case k6_SensorFloorGroupGenerator:
+				case kDMSensorFloorGroupGenerator:
 					continue;
 					break;
-				case k7_SensorFloorCreature:
+				case kDMSensorFloorCreature:
 					if ((thingType > kDMThingTypeGroup) || (thingType == kDMThingTypeParty) || squareContainsGroup)
 						continue;
 					break;
-				case k8_SensorFloorPartyPossession:
+				case kDMSensorFloorPartyPossession:
 					if (thingType != kDMThingTypeParty)
 						continue;
 
 					triggerSensor = isObjectInPartyPossession(curSensorData);
 					break;
-				case k9_SensorFloorVersionChecker:
+				case kDMSensorFloorVersionChecker:
 					if ((thingType != kDMThingTypeParty) || !addThing || partySquare)
 						continue;
 
@@ -818,15 +818,15 @@ void MovesensMan::processThingAdditionOrRemoval(uint16 mapX, uint16 mapY, Thing
 					continue;
 
 				switch (curSensor->getType()) {
-				case k1_SensorWallOrnClick:
+				case kDMSensorWallOrnClick:
 					if (squareContainsObject)
 						continue;
 					break;
-				case k2_SensorWallOrnClickWithAnyObj:
+				case kDMSensorWallOrnClickWithAnyObj:
 					if (squareContainsThingOfSameType || (curSensor->getData() != _vm->_objectMan->getObjectType(thing)))
 						continue;
 					break;
-				case k3_SensorWallOrnClickWithSpecObj:
+				case kDMSensorWallOrnClickWithSpecObj:
 					if (squareContainsThingOfDifferentType || (curSensor->getData() == _vm->_objectMan->getObjectType(thing)))
 						continue;
 					break;
@@ -838,8 +838,8 @@ void MovesensMan::processThingAdditionOrRemoval(uint16 mapX, uint16 mapY, Thing
 
 			triggerSensor ^= curSensor->getAttrRevertEffectA();
 			int16 curSensorEffect = curSensor->getAttrEffectA();
-			if (curSensorEffect == k3_SensorEffHold)
-				curSensorEffect = triggerSensor ? k0_SensorEffSet : k1_SensorEffClear;
+			if (curSensorEffect == kDMSensorEffectHold)
+				curSensorEffect = triggerSensor ? kDMSensorEffectSet : kDMSensorEffectClear;
 			else if (!triggerSensor)
 				continue;
 
@@ -926,7 +926,7 @@ void MovesensMan::triggerEffect(Sensor *sensor, int16 effect, int16 mapX, int16
 }
 
 void MovesensMan::triggerLocalEffect(int16 localEffect, int16 effX, int16 effY, int16 effCell) {
-	if (localEffect == k10_SensorEffAddExp) {
+	if (localEffect == kDMSensorEffectAddExperience) {
 		addSkillExperience(kDMSkillSteal, 300, localEffect != kDMCellAny);
 		return;
 	}
@@ -951,12 +951,12 @@ void MovesensMan::addSkillExperience(int16 skillIndex, uint16 exp, bool leaderOn
 }
 
 void MovesensMan::processRotationEffect() {
-	if (_sensorRotationEffect == kM1_SensorEffNone)
+	if (_sensorRotationEffect == kDMSensorEffectNone)
 		return;
 
 	switch (_sensorRotationEffect) {
-	case k1_SensorEffClear:
-	case k2_SensorEffToggle:
+	case kDMSensorEffectClear:
+	case kDMSensorEffectToggle:
 		Thing firstSensorThing = _vm->_dungeonMan->getSquareFirstThing(_sensorRotationEffMapX, _sensorRotationEffMapY);
 		while ((firstSensorThing.getType() != kDMThingTypeSensor)
 			|| ((_sensorRotationEffCell != kDMCellAny) && (firstSensorThing.getCell() != _sensorRotationEffCell))) {
@@ -982,7 +982,7 @@ void MovesensMan::processRotationEffect() {
 		firstSensor->setNextThing(lastSensor->getNextThing());
 		lastSensor->setNextThing(firstSensorThing);
 	}
-	_sensorRotationEffect = kM1_SensorEffNone;
+	_sensorRotationEffect = kDMSensorEffectNone;
 }
 
 void MovesensMan::createEventMoveGroup(Thing groupThing, int16 mapX, int16 mapY, int16 mapIndex, bool audible) {
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index 786a3b0c7b..74ba24bbe9 100644
--- a/engines/dm/projexpl.cpp
+++ b/engines/dm/projexpl.cpp
@@ -118,7 +118,7 @@ bool ProjExpl::hasProjectileImpactOccurred(int16 impactType, int16 mapXCombo, in
 		Door *curDoor = (Door *)_vm->_dungeonMan->getSquareFirstThingData(projectileTargetMapX, projectileTargetMapY);
 		if ((curDoorState != k5_doorState_DESTROYED) && (projectileAssociatedThing == Thing::_explOpenDoor)) {
 			if (curDoor->hasButton())
-				_vm->_moveSens->addEvent(k10_TMEventTypeDoor, projectileTargetMapX, projectileTargetMapY, 0, k2_SensorEffToggle, _vm->_gameTime + 1);
+				_vm->_moveSens->addEvent(k10_TMEventTypeDoor, projectileTargetMapX, projectileTargetMapY, 0, kDMSensorEffectToggle, _vm->_gameTime + 1);
 			break;
 		}
 
@@ -185,9 +185,9 @@ bool ProjExpl::hasProjectileImpactOccurred(int16 impactType, int16 mapXCombo, in
 			&& getFlag(curCreatureInfo->_attributes, k0x0400_MaskCreatureInfo_keepThrownSharpWeapon)) {
 				Weapon *weapon = (Weapon *)_vm->_dungeonMan->getThingData(projectileAssociatedThing);
 				WeaponType weaponType = weapon->getType();
-				if ((weaponType == k8_WeaponTypeDagger) || (weaponType == k27_WeaponTypeArrow)
-				|| (weaponType == k28_WeaponTypeSlayer) || (weaponType == k31_WeaponTypePoisonDart)
-				|| (weaponType == k32_WeaponTypeThrowingStar))
+				if ((weaponType == kDMWeaponDagger) || (weaponType == kDMWeaponArrow)
+				|| (weaponType == kDMWeaponSlayer) || (weaponType == kDMWeaponPoisonDart)
+				|| (weaponType == kDMWeaponThrowingStar))
 					curGroupSlot = &curGroup->_slot;
 			}
 		}
@@ -333,7 +333,7 @@ void ProjExpl::createExplosion(Thing explThing, uint16 attack, uint16 mapXCombo,
 					Group *creatureGroup = (Group *)_vm->_dungeonMan->getThingData(unusedThing);
 					CreatureInfo *creatureInfo = &_vm->_dungeonMan->_creatureInfos[creatureGroup->_type];
 					int16 creatureFireResistance = creatureInfo->getFireResistance();
-					if (creatureFireResistance != k15_immuneToFire) {
+					if (creatureFireResistance != kDMImmuneToFire) {
 						if (getFlag(creatureInfo->_attributes, k0x0040_MaskCreatureInfo_nonMaterial))
 							attack >>= 2;
 
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp
index 8bfa6ef0b6..fce768dff2 100644
--- a/engines/dm/timeline.cpp
+++ b/engines/dm/timeline.cpp
@@ -209,7 +209,7 @@ uint16 Timeline::addEventGetEventIndex(TimelineEvent *event) {
 				}
 				continue;
 			} else if ((curEvent->_type == k1_TMEventTypeDoorAnimation) && (event->_mapTime == curEvent->_mapTime) && (event->getMapXY() == curEvent->getMapXY())) {
-				if (event->_Cu.A._effect == k2_SensorEffToggle)
+				if (event->_Cu.A._effect == kDMSensorEffectToggle)
 					event->_Cu.A._effect = 1 - curEvent->_Cu.A._effect;
 
 				deleteEvent(eventIndex);
@@ -221,7 +221,7 @@ uint16 Timeline::addEventGetEventIndex(TimelineEvent *event) {
 		for (uint16 eventIndex = 0; eventIndex < _eventMaxCount; eventIndex++, curEvent++) {
 			if ((event->_mapTime == curEvent->_mapTime) && (event->getMapXY() == curEvent->getMapXY())) {
 				if (curEvent->_type == k10_TMEventTypeDoor) {
-					if (curEvent->_Cu.A._effect == k2_SensorEffToggle)
+					if (curEvent->_Cu.A._effect == kDMSensorEffectToggle)
 						curEvent->_Cu.A._effect = 1 - event->_Cu.A._effect;
 
 					return eventIndex;
@@ -389,7 +389,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) {
 
 	event->_mapTime++;
 	int16 sensorEffect = event->_Cu.A._effect;
-	if (sensorEffect == k1_SensorEffClear) {
+	if (sensorEffect == kDMSensorEffectClear) {
 		Door *curDoor = (Door *)_vm->_dungeonMan->getSquareFirstThingData(mapX, mapY);
 		bool verticalDoorFl = curDoor->opensVertically();
 		if ((_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex) && (mapX == _vm->_dungeonMan->_partyMapX)
@@ -424,17 +424,17 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) {
 			}
 		}
 	}
-	if ((sensorEffect == k0_SensorEffSet) && (doorState == k0_doorState_OPEN))
+	if ((sensorEffect == kDMSensorEffectSet) && (doorState == k0_doorState_OPEN))
 		return;
 
-	if ((sensorEffect == k1_SensorEffClear) && (doorState == k4_doorState_CLOSED))
+	if ((sensorEffect == kDMSensorEffectClear) && (doorState == k4_doorState_CLOSED))
 		return;
 
-	doorState += (sensorEffect == k0_SensorEffSet) ? -1 : 1;
+	doorState += (sensorEffect == kDMSensorEffectSet) ? -1 : 1;
 	curSquare->setDoorState(doorState);
 	_vm->_sound->requestPlay(k02_soundDOOR_RATTLE, mapX, mapY, k1_soundModePlayIfPrioritized);
 
-	if (sensorEffect == k0_SensorEffSet) {
+	if (sensorEffect == kDMSensorEffectSet) {
 		if (doorState == k0_doorState_OPEN)
 			return;
 	} else if (doorState == k4_doorState_CLOSED)
@@ -448,10 +448,10 @@ void Timeline::processEventSquareFakewall(TimelineEvent *event) {
 	uint16 mapY = event->_Bu._location._mapY;
 	byte *curSquare = &_vm->_dungeonMan->_currMapData[mapX][mapY];
 	int16 effect = event->_Cu.A._effect;
-	if (effect == k2_SensorEffToggle)
-		effect = getFlag(*curSquare, k0x0004_FakeWallOpen) ? k1_SensorEffClear : k0_SensorEffSet;
+	if (effect == kDMSensorEffectToggle)
+		effect = getFlag(*curSquare, k0x0004_FakeWallOpen) ? kDMSensorEffectClear : kDMSensorEffectSet;
 
-	if (effect == k1_SensorEffClear) {
+	if (effect == kDMSensorEffectClear) {
 		if ((_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex) && (mapX == _vm->_dungeonMan->_partyMapX) && (mapY == _vm->_dungeonMan->_partyMapY)) {
 			event->_mapTime++;
 			addEventGetEventIndex(event);
@@ -477,9 +477,9 @@ void Timeline::processEventSquareDoor(TimelineEvent *event) {
 	if (doorState == k5_doorState_DESTROYED)
 		return;
 
-	if (event->_Cu.A._effect == k2_SensorEffToggle)
-		event->_Cu.A._effect = (doorState == k0_doorState_OPEN) ? k1_SensorEffClear : k0_SensorEffSet;
-	else if (event->_Cu.A._effect == k0_SensorEffSet) {
+	if (event->_Cu.A._effect == kDMSensorEffectToggle)
+		event->_Cu.A._effect = (doorState == k0_doorState_OPEN) ? kDMSensorEffectClear : kDMSensorEffectSet;
+	else if (event->_Cu.A._effect == kDMSensorEffectSet) {
 		if ((doorState == k0_doorState_OPEN) || (doorState == k4_doorState_CLOSED))
 			return;
 	}
@@ -492,10 +492,10 @@ void Timeline::processEventSquarePit(TimelineEvent *event) {
 	uint16 mapY = event->_Bu._location._mapY;
 
 	byte *square = &_vm->_dungeonMan->_currMapData[mapX][mapY];
-	if (event->_Cu.A._effect == k2_SensorEffToggle)
-		event->_Cu.A._effect = getFlag(*square, k0x0008_PitOpen) ? k1_SensorEffClear : k0_SensorEffSet;
+	if (event->_Cu.A._effect == kDMSensorEffectToggle)
+		event->_Cu.A._effect = getFlag(*square, k0x0008_PitOpen) ? kDMSensorEffectClear : kDMSensorEffectSet;
 
-	if (event->_Cu.A._effect == k0_SensorEffSet) {
+	if (event->_Cu.A._effect == kDMSensorEffectSet) {
 		setFlag(*square, k0x0008_PitOpen);
 		moveTeleporterOrPitSquareThings(mapX, mapY);
 	} else
@@ -559,10 +559,10 @@ void Timeline::processEventSquareTeleporter(TimelineEvent *event) {
 	uint16 mapY = event->_Bu._location._mapY;
 
 	byte *curSquare = &_vm->_dungeonMan->_currMapData[mapX][mapY];
-	if (event->_Cu.A._effect == k2_SensorEffToggle)
-		event->_Cu.A._effect = getFlag(*curSquare, k0x0008_TeleporterOpen) ? k1_SensorEffClear : k0_SensorEffSet;
+	if (event->_Cu.A._effect == kDMSensorEffectToggle)
+		event->_Cu.A._effect = getFlag(*curSquare, k0x0008_TeleporterOpen) ? kDMSensorEffectClear : kDMSensorEffectSet;
 
-	if (event->_Cu.A._effect == k0_SensorEffSet) {
+	if (event->_Cu.A._effect == kDMSensorEffectSet) {
 		setFlag(*curSquare, k0x0008_TeleporterOpen);
 		moveTeleporterOrPitSquareThings(mapX, mapY);
 	} else
@@ -578,32 +578,32 @@ void Timeline::processEventSquareWall(TimelineEvent *event) {
 		int16 curThingType = curThing.getType();
 		if ((curThingType == kDMstringTypeText) && (curThing.getCell() == event->_Cu.A._cell)) {
 			TextString *textString = (TextString *)_vm->_dungeonMan->getThingData(curThing);
-			if (event->_Cu.A._effect == k2_SensorEffToggle)
+			if (event->_Cu.A._effect == kDMSensorEffectToggle)
 				textString->setVisible(!textString->isVisible());
 			else
-				textString->setVisible(event->_Cu.A._effect == k0_SensorEffSet);
+				textString->setVisible(event->_Cu.A._effect == kDMSensorEffectSet);
 		} else if (curThingType == kDMThingTypeSensor) {
 			Sensor *curThingSensor = (Sensor *)_vm->_dungeonMan->getThingData(curThing);
 			uint16 curSensorType = curThingSensor->getType();
 			uint16 curSensorData = curThingSensor->getData();
-			if (curSensorType == k6_SensorWallCountdown) {
+			if (curSensorType == kDMSensorWallCountdown) {
 				if (curSensorData > 0) {
-					if (event->_Cu.A._effect == k0_SensorEffSet) {
+					if (event->_Cu.A._effect == kDMSensorEffectSet) {
 						if (curSensorData < 511)
 							curSensorData++;
 					} else
 						curSensorData--;
 
 					curThingSensor->setData(curSensorData);
-					if (curThingSensor->getAttrEffectA() == k3_SensorEffHold) {
+					if (curThingSensor->getAttrEffectA() == kDMSensorEffectHold) {
 						int16 triggerSetEffect = ((curSensorData == 0) != curThingSensor->getAttrRevertEffectA());
-						_vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? k0_SensorEffSet : k1_SensorEffClear, mapX, mapY, curCell);
+						_vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? kDMSensorEffectSet : kDMSensorEffectClear, mapX, mapY, curCell);
 					} else if (curSensorData == 0)
 						_vm->_moveSens->triggerEffect(curThingSensor, curThingSensor->getAttrEffectA(), mapX, mapY, curCell);
 				}
-			} else if (curSensorType == k5_SensorWallAndOrGate) {
+			} else if (curSensorType == kDMSensorWallAndOrGate) {
 				int16 bitMask = 1 << (event->_Cu.A._cell);
-				if (event->_Cu.A._effect == k2_SensorEffToggle) {
+				if (event->_Cu.A._effect == kDMSensorEffectToggle) {
 					if (getFlag(curSensorData, bitMask))
 						clearFlag(curSensorData, bitMask);
 					else
@@ -615,15 +615,15 @@ void Timeline::processEventSquareWall(TimelineEvent *event) {
 
 				curThingSensor->setData(curSensorData);
 				bool triggerSetEffect = (Sensor::getDataMask1(curSensorData) == Sensor::getDataMask2(curSensorData)) != curThingSensor->getAttrRevertEffectA();
-				if (curThingSensor->getAttrEffectA() == k3_SensorEffHold)
-					_vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? k0_SensorEffSet : k1_SensorEffClear, mapX, mapY, curCell);
+				if (curThingSensor->getAttrEffectA() == kDMSensorEffectHold)
+					_vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? kDMSensorEffectSet : kDMSensorEffectClear, mapX, mapY, curCell);
 				else if (triggerSetEffect)
 					_vm->_moveSens->triggerEffect(curThingSensor, curThingSensor->getAttrEffectA(), mapX, mapY, curCell);
-			} else if ((((curSensorType >= k7_SensorWallSingleProjLauncherNewObj) && (curSensorType <= k10_SensorWallDoubleProjLauncherExplosion)) || (curSensorType == k14_SensorWallSingleProjLauncherSquareObj) || (curSensorType == k15_SensorWallDoubleProjLauncherSquareObj)) && (curThing.getCell() == event->_Cu.A._cell)) {
+			} else if ((((curSensorType >= kDMSensorWallSingleProjLauncherNewObj) && (curSensorType <= kDMSensorWallDoubleProjLauncherExplosion)) || (curSensorType == kDMSensorWallSingleProjLauncherSquareObj) || (curSensorType == kDMSensorWallDoubleProjLauncherSquareObj)) && (curThing.getCell() == event->_Cu.A._cell)) {
 				triggerProjectileLauncher(curThingSensor, event);
 				if (curThingSensor->getAttrOnlyOnce())
 					curThingSensor->setTypeDisabled();
-			} else if (curSensorType == k18_SensorWallEndGame) {
+			} else if (curSensorType == kDMSensorWallEndGame) {
 				_vm->delay(60 * curThingSensor->getAttrValue());
 				_vm->_restartGameAllowed = false;
 				_vm->_gameWon = true;
@@ -644,15 +644,15 @@ void Timeline::triggerProjectileLauncher(Sensor *sensor, TimelineEvent *event) {
 	int16 sensorData = sensor->getData();
 	int16 kineticEnergy = sensor->getActionKineticEnergy();
 	int16 stepEnergy = sensor->getActionStepEnergy();
-	bool launchSingleProjectile = (sensorType == k7_SensorWallSingleProjLauncherNewObj) ||
-		(sensorType == k8_SensorWallSingleProjLauncherExplosion) ||
-		(sensorType == k14_SensorWallSingleProjLauncherSquareObj);
+	bool launchSingleProjectile = (sensorType == kDMSensorWallSingleProjLauncherNewObj) ||
+		(sensorType == kDMSensorWallSingleProjLauncherExplosion) ||
+		(sensorType == kDMSensorWallSingleProjLauncherSquareObj);
 
 	Thing firstProjectileAssociatedThing;
 	Thing secondProjectileAssociatedThing;
-	if ((sensorType == k8_SensorWallSingleProjLauncherExplosion) || (sensorType == k10_SensorWallDoubleProjLauncherExplosion))
+	if ((sensorType == kDMSensorWallSingleProjLauncherExplosion) || (sensorType == kDMSensorWallDoubleProjLauncherExplosion))
 		firstProjectileAssociatedThing = secondProjectileAssociatedThing = Thing(sensorData + Thing::_firstExplosion.toUint16());
-	else if ((sensorType == k14_SensorWallSingleProjLauncherSquareObj) || (sensorType == k15_SensorWallDoubleProjLauncherSquareObj)) {
+	else if ((sensorType == kDMSensorWallSingleProjLauncherSquareObj) || (sensorType == kDMSensorWallDoubleProjLauncherSquareObj)) {
 		firstProjectileAssociatedThing = _vm->_dungeonMan->getSquareFirstThing(mapX, mapY);
 		while (firstProjectileAssociatedThing != Thing::_none) { /* BUG0_19 The game crashes when an object launcher sensor is triggered. Thing::_none should be Thing::_endOfList. If there are no more objects on the square then this loop may return an undefined value, this can crash the game. In the original DM and CSB dungeons, the number of times that these sensors are triggered is always controlled to be equal to the number of available objects (with a countdown sensor or a number of once only sensors) */
 			uint16 projectiveThingCell = firstProjectileAssociatedThing.getCell();
@@ -709,10 +709,10 @@ void Timeline::processEventSquareCorridor(TimelineEvent *event) {
 		if (curThingType == kDMstringTypeText) {
 			TextString *textString = (TextString *)_vm->_dungeonMan->getThingData(curThing);
 			bool textCurrentlyVisible = textString->isVisible();
-			if (event->_Cu.A._effect == k2_SensorEffToggle)
+			if (event->_Cu.A._effect == kDMSensorEffectToggle)
 				textString->setVisible(!textCurrentlyVisible);
 			else
-				textString->setVisible((event->_Cu.A._effect == k0_SensorEffSet));
+				textString->setVisible((event->_Cu.A._effect == kDMSensorEffectSet));
 
 			if (!textCurrentlyVisible && textString->isVisible() && (_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex) && (mapX == _vm->_dungeonMan->_partyMapX) && (mapY == _vm->_dungeonMan->_partyMapY)) {
 				_vm->_dungeonMan->decodeText(_vm->_stringBuildBuffer, curThing, kDMTextTypeMessage);
@@ -720,7 +720,7 @@ void Timeline::processEventSquareCorridor(TimelineEvent *event) {
 			}
 		} else if (curThingType == kDMThingTypeSensor) {
 			Sensor *curSensor = (Sensor *)_vm->_dungeonMan->getThingData(curThing);
-			if (curSensor->getType() == k6_SensorFloorGroupGenerator) {
+			if (curSensor->getType() == kDMSensorFloorGroupGenerator) {
 				int16 creatureCount = curSensor->getAttrValue();
 				if (getFlag(creatureCount, k0x0008_randomizeGeneratedCreatureCount))
 					creatureCount = _vm->getRandomNumber(getFlag(creatureCount, k0x0007_generatedCreatureCount));
@@ -803,8 +803,8 @@ void Timeline::procesEventEnableGroupGenerator(TimelineEvent *event) {
 	while (curThing != Thing::_none) {
 		if ((curThing.getType()) == kDMThingTypeSensor) {
 			Sensor *curSensor = (Sensor *)_vm->_dungeonMan->getThingData(curThing);
-			if (curSensor->getType() == k0_SensorDisabled) {
-				curSensor->setDatAndTypeWithOr(k6_SensorFloorGroupGenerator);
+			if (curSensor->getType() == kDMSensorDisabled) {
+				curSensor->setDatAndTypeWithOr(kDMSensorFloorGroupGenerator);
 				return;
 			}
 		}