DM: Janitorial - remove trailing spaces

13 files changed, 181 insertions, 182 deletions

diff --git a/engines/dm/TODOs/methodtree.txt b/engines/dm/TODOs/methodtree.txt
index cbd8d1fbba..9a5a856a24 100644
--- a/engines/dm/TODOs/methodtree.txt
+++ b/engines/dm/TODOs/methodtree.txt
@@ -7,28 +7,28 @@ F0115_DUNGEONVIEW_DrawObjectsCreaturesProjectilesExplosions_CPSEF
 	F0114_DUNGEONVIEW_GetExplosionBitmap // done
 	F0133_VIDEO_BlitBoxFilledWithMaskedBitmap // dummy
 	F0141_DUNGEON_GetObjectInfoIndex // done
-	F0142_DUNGEON_GetProjectileAspect // done 
+	F0142_DUNGEON_GetProjectileAspect // done
 		F0158_DUNGEON_GetWeaponInfo // done
 		M66_PROJECTILE_ASPECT_ORDINAL // done
 	F0176_GROUP_GetCreatureOrdinalInCell // done
 		F0145_DUNGEON_GetGroupCells // done
 		F0147_DUNGEON_GetGroupDirections // done
-		GROUP // done 
-		CreatureType // done 
+		GROUP // done
+		CreatureType // done
 	G0077_B_DoNotDrawFluxcagesDuringEndgame // done
 	G0105_s_Graphic558_Box_ExplosionPattern_D0C // one
 	G0188_as_Graphic558_FieldAspects // done
 	G0216_auc_Graphic558_ExplosionBaseScales // done
-	G0217_aauc_Graphic558_ObjectPileShiftSetIndices // done 
-	G0218_aaaauc_Graphic558_ObjectCoordinateSets // done 
+	G0217_aauc_Graphic558_ObjectPileShiftSetIndices // done
+	G0218_aaaauc_Graphic558_ObjectCoordinateSets // done
 	G0223_aac_Graphic558_ShiftSets // done
-	G0224_aaaauc_Graphic558_CreatureCoordinateSets // done 
+	G0224_aaaauc_Graphic558_CreatureCoordinateSets // done
 	G0225_aai_Graphic558_CenteredExplosionCoordinates // done
 	G0226_aaai_Graphic558_ExplosionCoordinates // done
 	G0227_aai_Graphic558_RebirthStep2ExplosionCoordinates // done
 	G0228_aai_Graphic558_RebirthStep1ExplosionCoordinates // done
 	G0292_aT_PileTopObject // done
-	G0370_ps_Events // done 
+	G0370_ps_Events // done
 
 
 
@@ -39,7 +39,7 @@ F0380_COMMAND_ProcessQueue_CPSC // in progress
 			F0372_COMMAND_ProcessType80_ClickInDungeonView_TouchFrontWall // done so-so
 				F0275_SENSOR_IsTriggeredByClickOnWall // done so-so
 					F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
-	
+
 
 F0378_COMMAND_ProcessType81_ClickInPanel // done so-so
 	F0282_CHAMPION_ProcessCommands160To162_ClickInResurrectReincarnatePanel // done
@@ -76,9 +76,9 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 			F0345_INVENTORY_DrawPanel_FoodWaterPoisoned // done
 				F0344_INVENTORY_DrawPanel_FoodOrWaterBar // done
 						F0343_INVENTORY_DrawPanel_HorizontalBar // done
-				G0032_s_Graphic562_Box_Panel // done 
-				G0035_s_Graphic562_Box_Food // done 
-				G0036_s_Graphic562_Box_Water // done 
+				G0032_s_Graphic562_Box_Panel // done
+				G0035_s_Graphic562_Box_Food // done
+				G0036_s_Graphic562_Box_Water // done
 				G0037_s_Graphic562_Box_Poisoned // done
 			F0351_INVENTORY_DrawChampionSkillsAndStatistics // skip -----------------
 			F0347_INVENTORY_DrawPanel // done
@@ -87,12 +87,12 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 						F0340_INVENTORY_DrawPanel_ScrollTextLine // done
 					F0333_INVENTORY_OpenAndDrawChest // done
 					F0303_CHAMPION_GetSkillLevel // done
-					F0332_INVENTORY_DrawIconToViewport // done 
+					F0332_INVENTORY_DrawIconToViewport // done
 					F0336_INVENTORY_DrawPanel_BuildObjectAttributesString // done
-					F0335_INVENTORY_DrawPanel_ObjectDescriptionString // done 
+					F0335_INVENTORY_DrawPanel_ObjectDescriptionString // done
 						G0421_i_ObjectDescriptionTextX // done
 						G0422_i_ObjectDescriptionTextY // done
-					F0339_INVENTORY_DrawPanel_ArrowOrEye // done 
+					F0339_INVENTORY_DrawPanel_ArrowOrEye // done
 					G0430_apc_DirectionNames // done
 					G0034_s_Graphic562_Box_ObjectDescriptionCircle // done
 					G0032_s_Graphic562_Box_Panel // done
@@ -116,8 +116,8 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 		F0292_CHAMPION_DrawState // done
 		G0508_B_RefreshActionArea // done
 		G0506_ui_ActingChampionOrdinal // done
-	F0386_MENUS_DrawActionIcon // done								
-		F0141_DUNGEON_GetObjectInfoIndex // done 
+	F0386_MENUS_DrawActionIcon // done
+		F0141_DUNGEON_GetObjectInfoIndex // done
 		F0033_OBJECT_GetIconIndex // done
 			F0032_OBJECT_GetType // done
 				G0237_as_Graphic559_ObjectInfo // done
@@ -126,7 +126,7 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 		F0134_VIDEO_FillBitmap // done
 		D24_FillScreenBox // done
 		F0036_OBJECT_ExtractIconFromBitmap // done
-			G0026_ai_Graphic562_IconGraphicFirstIconIndex // done 
+			G0026_ai_Graphic562_IconGraphicFirstIconIndex // done
 		F0129_VIDEO_BlitShrinkWithPaletteChanges // eeeh
 		F0136_VIDEO_ShadeScreenBox // skip
 		G0498_auc_Graphic560_PaletteChanges_ActionAreaObjectIcon // done
@@ -134,18 +134,18 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 		G0509_B_ActionAreaContainsIcons // done
 	F0301_CHAMPION_AddObjectInSlot // done
 		F0299_CHAMPION_ApplyObjectModifiersToStatistics // done
-		F0296_CHAMPION_DrawChangedObjectIcons // done 
+		F0296_CHAMPION_DrawChangedObjectIcons // done
 			F0068_MOUSE_SetPointerToObject // skip
 			F0077_MOUSE_HidePointer_CPSE // skip
 			F0078_MOUSE_ShowPointer // skip
 			F0034_OBJECT_DrawLeaderHandObjectName // done
 			F0386_MENUS_DrawActionIcon // done
-			F0295_CHAMPION_HasObjectIconInSlotBoxChanged // done 	
-				F0039_OBJECT_GetIconIndexInSlotBox // done 
+			F0295_CHAMPION_HasObjectIconInSlotBoxChanged // done
+				F0039_OBJECT_GetIconIndexInSlotBox // done
 			M70_HAND_SLOT_INDEX // done
 			G0420_B_MousePointerHiddenToDrawChangedObjectIconOnScreen // done
 			G0412_puc_Bitmap_ObjectIconForMousePointer // done
-			G0413_i_LeaderHandObjectIconIndex // done 
+			G0413_i_LeaderHandObjectIconIndex // done
 			G0414_T_LeaderHandObject // done
 		F0337_INVENTORY_SetDungeonViewPalette // skip
 		G0407_s_Party // done
@@ -166,7 +166,7 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 		G0326_B_RefreshMousePointerInMainLoop  // lol you wat m8
 		G0002_s_Graphic562_Box_MovementArrows // done
 		G0041_s_Graphic562_Box_ViewportFloppyZzzCross // done
-		G0296_puc_Bitmap_Viewport // done 
+		G0296_puc_Bitmap_Viewport // done
 		G0598_B_MousePointerBitmapUpdated // done
 	F0456_START_DrawDisabledMenus // done
 	G0415_B_LeaderEmptyHanded // done
@@ -174,15 +174,15 @@ F0280_CHAMPION_AddCandidateChampionToParty // done, so-so
 	G0578_B_UseByteBoxCoordinates // done
 	G0047_s_Graphic562_Box_ChampionPortrait // done
 	G0308_i_PartyDirection // done
-	G0306_i_PartyMapX // done 
+	G0306_i_PartyMapX // done
 	G0307_i_PartyMapY // done
 	G0299_ui_CandidateChampionOrdinal // done
 	G0508_B_RefreshActionArea // done
-	G0233_ai_Graphic559_DirectionToStepEastCount // done 
+	G0233_ai_Graphic559_DirectionToStepEastCount // done
 	G0234_ai_Graphic559_DirectionToStepNorthCount // done
 	G0237_as_Graphic559_ObjectInfo // done
 	G0038_ai_Graphic562_SlotMasks // done
-						
+
 
 F0462_START_StartGame_CPSF
 	F0003_MAIN_ProcessNewPartyMap_CPSE // partially done
diff --git a/engines/dm/TODOs/todo.txt b/engines/dm/TODOs/todo.txt
index def2956c8e..074ccf0599 100644
--- a/engines/dm/TODOs/todo.txt
+++ b/engines/dm/TODOs/todo.txt
@@ -5,12 +5,12 @@ Bugs:
 		DisplayMan::blitBoxFilledWithMaskedBitmap does not produce the same effect as the original
 
 	Logic:
-		Items thrown on the right side end up on the left side 
+		Items thrown on the right side end up on the left side
 		Restarting the game after the party is dead segfaults
 
 Todo:
 	Add wiki entry for DM
-	
+
 	Double check enums with hex literals
 	Double check strcat, strstr usages
 	I forgot to add a bunch of warning for show/hide mouse pointer and other mouse functions
@@ -19,4 +19,3 @@ Code stuff todo:
 	Complete stub methods(blitShrink)
 	Add proper save header, add error handling to it
 	Add translations to f433_processCommand140_saveGame 'LOAD'
-	
\ No newline at end of file
diff --git a/engines/dm/champion.h b/engines/dm/champion.h
index fe565123fa..ffcd7abc42 100644
--- a/engines/dm/champion.h
+++ b/engines/dm/champion.h
@@ -35,8 +35,8 @@
 
 namespace DM {
 
-#define kDMIgnoreObjectModifiers 0x4000 // @ MASK0x4000_IGNORE_OBJECT_MODIFIERS     
-#define kDMIgnoreTemporaryExperience 0x8000 // @ MASK0x8000_IGNORE_TEMPORARY_EXPERIENCE 
+#define kDMIgnoreObjectModifiers 0x4000 // @ MASK0x4000_IGNORE_OBJECT_MODIFIERS
+#define kDMIgnoreTemporaryExperience 0x8000 // @ MASK0x8000_IGNORE_TEMPORARY_EXPERIENCE
 
 class Scent {
 	uint16 _scent;
@@ -349,50 +349,50 @@ enum AttackType {
 };
 
 enum SpellCastResult {
-	kDMSpellCastFailure = 0, // @ C0_SPELL_CAST_FAILURE             
-	kDMSpellCastSuccess = 1, // @ C1_SPELL_CAST_SUCCESS             
-	kDMSpellCastFailureNeedsFlask = 3 // @ C3_SPELL_CAST_FAILURE_NEEDS_FLASK 
+	kDMSpellCastFailure = 0, // @ C0_SPELL_CAST_FAILURE
+	kDMSpellCastSuccess = 1, // @ C1_SPELL_CAST_SUCCESS
+	kDMSpellCastFailureNeedsFlask = 3 // @ C3_SPELL_CAST_FAILURE_NEEDS_FLASK
 };
 
 enum SpellFailure {
-	kDMFailureNeedsMorePractice = 0, // @ C00_FAILURE_NEEDS_MORE_PRACTICE      
-	kDMFailureMeaninglessSpell = 1, // @ C01_FAILURE_MEANINGLESS_SPELL        
-	kDMFailureNeedsFlaskInHand = 10, // @ C10_FAILURE_NEEDS_FLASK_IN_HAND     
-	kDMFailureNeedsMagicMapInHand = 11 // @ C11_FAILURE_NEEDS_MAGIC_MAP_IN_HAND 
+	kDMFailureNeedsMorePractice = 0, // @ C00_FAILURE_NEEDS_MORE_PRACTICE
+	kDMFailureMeaninglessSpell = 1, // @ C01_FAILURE_MEANINGLESS_SPELL
+	kDMFailureNeedsFlaskInHand = 10, // @ C10_FAILURE_NEEDS_FLASK_IN_HAND
+	kDMFailureNeedsMagicMapInHand = 11 // @ C11_FAILURE_NEEDS_MAGIC_MAP_IN_HAND
 };
 
 enum SpellKind {
-	kDMSpellKindPotion = 1, // @ C1_SPELL_KIND_POTION    
+	kDMSpellKindPotion = 1, // @ C1_SPELL_KIND_POTION
 	kDMSpellKindProjectile = 2, // @ C2_SPELL_KIND_PROJECTILE
-	kDMSpellKindOther = 3, // @ C3_SPELL_KIND_OTHER     
-	kDMSpellKindMagicMap = 4 // @ C4_SPELL_KIND_MAGIC_MAP 
+	kDMSpellKindOther = 3, // @ C3_SPELL_KIND_OTHER
+	kDMSpellKindMagicMap = 4 // @ C4_SPELL_KIND_MAGIC_MAP
 };
 
 enum SpellType {
 	kDMSpellTypeProjectileOpenDoor = 4, // @ C4_SPELL_TYPE_PROJECTILE_OPEN_DOOR
-	kDMSpellTypeOtherLight = 0, // @ C0_SPELL_TYPE_OTHER_LIGHT         
-	kDMSpellTypeOtherDarkness = 1, // @ C1_SPELL_TYPE_OTHER_DARKNESS      
-	kDMSpellTypeOtherThievesEye = 2, // @ C2_SPELL_TYPE_OTHER_THIEVES_EYE   
-	kDMSpellTypeOtherInvisibility = 3, // @ C3_SPELL_TYPE_OTHER_INVISIBILITY  
-	kDMSpellTypeOtherPartyShield = 4, // @ C4_SPELL_TYPE_OTHER_PARTY_SHIELD  
-	kDMSpellTypeOtherMagicTorch = 5, // @ C5_SPELL_TYPE_OTHER_MAGIC_TORCH   
-	kDMSpellTypeOtherFootprints = 6, // @ C6_SPELL_TYPE_OTHER_FOOTPRINTS    
-	kDMSpellTypeOtherZokathra = 7, // @ C7_SPELL_TYPE_OTHER_ZOKATHRA      
-	kDMSpellTypeOtherFireshield = 8, // @ C8_SPELL_TYPE_OTHER_FIRESHIELD    
-	kDMSpellTypeMagicMap0 = 0, // @ C0_SPELL_TYPE_MAGIC_MAP           
-	kDMSpellTypeMagicMap1 = 1, // @ C1_SPELL_TYPE_MAGIC_MAP           
-	kDMSpellTypeMagicMap2 = 2, // @ C2_SPELL_TYPE_MAGIC_MAP           
-	kDMSpellTypeMagicMap3 = 3 // @ C3_SPELL_TYPE_MAGIC_MAP           
+	kDMSpellTypeOtherLight = 0, // @ C0_SPELL_TYPE_OTHER_LIGHT
+	kDMSpellTypeOtherDarkness = 1, // @ C1_SPELL_TYPE_OTHER_DARKNESS
+	kDMSpellTypeOtherThievesEye = 2, // @ C2_SPELL_TYPE_OTHER_THIEVES_EYE
+	kDMSpellTypeOtherInvisibility = 3, // @ C3_SPELL_TYPE_OTHER_INVISIBILITY
+	kDMSpellTypeOtherPartyShield = 4, // @ C4_SPELL_TYPE_OTHER_PARTY_SHIELD
+	kDMSpellTypeOtherMagicTorch = 5, // @ C5_SPELL_TYPE_OTHER_MAGIC_TORCH
+	kDMSpellTypeOtherFootprints = 6, // @ C6_SPELL_TYPE_OTHER_FOOTPRINTS
+	kDMSpellTypeOtherZokathra = 7, // @ C7_SPELL_TYPE_OTHER_ZOKATHRA
+	kDMSpellTypeOtherFireshield = 8, // @ C8_SPELL_TYPE_OTHER_FIRESHIELD
+	kDMSpellTypeMagicMap0 = 0, // @ C0_SPELL_TYPE_MAGIC_MAP
+	kDMSpellTypeMagicMap1 = 1, // @ C1_SPELL_TYPE_MAGIC_MAP
+	kDMSpellTypeMagicMap2 = 2, // @ C2_SPELL_TYPE_MAGIC_MAP
+	kDMSpellTypeMagicMap3 = 3 // @ C3_SPELL_TYPE_MAGIC_MAP
 };
 
-#define kDMMaskNoSharpDefense 0x0000 // @ MASK0x0000_DO_NOT_USE_SHARP_DEFENSE 
-#define kDMMaskSharpDefense 0x8000 // @ MASK0x8000_USE_SHARP_DEFENSE        
+#define kDMMaskNoSharpDefense 0x0000 // @ MASK0x0000_DO_NOT_USE_SHARP_DEFENSE
+#define kDMMaskSharpDefense 0x8000 // @ MASK0x8000_USE_SHARP_DEFENSE
 
 class Skill {
 public:
 	int16 _temporaryExperience;
 	int32 _experience;
-	
+
 	void resetToZero() { _temporaryExperience = _experience = 0; }
 }; // @ SKILL
 
@@ -524,7 +524,7 @@ public:
 	void addObjectInSlot(ChampionIndex champIndex, Thing thing, ChampionSlot slotIndex); // @ F0301_CHAMPION_AddObjectInSlot
 	int16 getScentOrdinal(int16 mapX, int16 mapY); // @ F0315_CHAMPION_GetScentOrdinal
 	Thing getObjectRemovedFromLeaderHand(); // @ F0298_CHAMPION_GetObjectRemovedFromLeaderHand
-	uint16 getStrength(int16 champIndex, int16 slotIndex); // @ F0312_CHAMPION_GetStrength 
+	uint16 getStrength(int16 champIndex, int16 slotIndex); // @ F0312_CHAMPION_GetStrength
 	Thing getObjectRemovedFromSlot(uint16 champIndex, uint16 slotIndex); // @ F0300_CHAMPION_GetObjectRemovedFromSlot
 	void decrementStamina(int16 championIndex, int16 decrement); // @ F0325_CHAMPION_DecrementStamina
 	int16 addPendingDamageAndWounds_getDamage(int16 champIndex, int16 attack, int16 allowedWounds,
diff --git a/engines/dm/console.cpp b/engines/dm/console.cpp
index c5310ddd87..978fadb750 100644
--- a/engines/dm/console.cpp
+++ b/engines/dm/console.cpp
@@ -139,7 +139,7 @@ bool Console::Cmd_pos(int argc, const char** argv) {
 
 		Map &currMap = *_vm->_dungeonMan->_currMap;
 		// not >= because dimensions are inslucsive
-		if (x < currMap._offsetMapX || x > currMap._width + currMap._offsetMapX 
+		if (x < currMap._offsetMapX || x > currMap._width + currMap._offsetMapX
 			|| y < currMap._offsetMapY || y > currMap._height + currMap._offsetMapY) {
 			debugPrintf("Position (%d, %d) is out of bounds, possible values: ([1-%d],[1-%d])\n", x, y,
 						currMap._width + currMap._offsetMapX, currMap._height + currMap._offsetMapY);
diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp
index af38bcd0ee..39fbadd8e5 100644
--- a/engines/dm/dialog.cpp
+++ b/engines/dm/dialog.cpp
@@ -175,7 +175,7 @@ int16 DialogMan::getChoice(uint16 choiceCount, uint16 dialogSetIndex, int16 driv
 		_vm->_eventMan->processCommandQueue();
 		_vm->delay(1);
 		_vm->_displayMan->updateScreen();
-		if ((_selectedDialogChoice == 99) && (choiceCount == 1) 
+		if ((_selectedDialogChoice == 99) && (choiceCount == 1)
 			&& (eventType != Common::EVENT_INVALID) && key.kbd.keycode == Common::KEYCODE_RETURN) {
 			/* If a choice has not been made yet with the mouse and the dialog has only one possible choice and carriage return was pressed on the keyboard */
 			_selectedDialogChoice = kDMDialogChoice1;
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index 91684dafa3..6549db13b5 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -76,11 +76,11 @@ enum OriginalSavePlatform {
 	kDMSavePlatformAcceptAny = -1,
 	kDMSavePlatformEndOfList = 0,
 	kDMSavePlatformNone = 0,
-	kDMSavePlatformAtariSt = 1, // @ C1_PLATFORM_ATARI_ST   
-	kDMSavePlatformAppleIIgs = 2, // @ C2_PLATFORM_APPLE_IIGS 
-	kDMSavePlatformAmiga = 3, // @ C3_PLATFORM_AMIGA      
-	kDMSavePlatformPC98 = 5, // @ C5_PLATFORM_PC98       
-	kDMSavePlatformX68000 = 6, // @ C6_PLATFORM_X68000     
+	kDMSavePlatformAtariSt = 1, // @ C1_PLATFORM_ATARI_ST
+	kDMSavePlatformAppleIIgs = 2, // @ C2_PLATFORM_APPLE_IIGS
+	kDMSavePlatformAmiga = 3, // @ C3_PLATFORM_AMIGA
+	kDMSavePlatformPC98 = 5, // @ C5_PLATFORM_PC98
+	kDMSavePlatformX68000 = 6, // @ C6_PLATFORM_X68000
 	kDMSavePlatformFmTownsEN = 7, // @ C7_PLATFORM_FM_TOWNS_EN
 	kDMSavePlatformFmTownsJP = 8, // @ C8_PLATFORM_FM_TOWNS_JP
 	kDMSavePlatformPC = 9, // @ C9_PLATFORM_PC
@@ -104,35 +104,35 @@ enum Direction {
 
 enum ThingType {
 	kDMThingTypeParty = -1,  // @ CM1_THING_TYPE_PARTY
-	kDMThingTypeDoor = 0, // @ C00_THING_TYPE_DOOR       
-	kDMThingTypeTeleporter = 1, // @ C01_THING_TYPE_TELEPORTER 
-	kDMstringTypeText = 2, // @ C02_THING_TYPE_TEXTSTRING 
-	kDMThingTypeSensor = 3,  // @ C03_THING_TYPE_SENSOR     
-	kDMThingTypeGroup = 4, // @ C04_THING_TYPE_GROUP 
+	kDMThingTypeDoor = 0, // @ C00_THING_TYPE_DOOR
+	kDMThingTypeTeleporter = 1, // @ C01_THING_TYPE_TELEPORTER
+	kDMstringTypeText = 2, // @ C02_THING_TYPE_TEXTSTRING
+	kDMThingTypeSensor = 3,  // @ C03_THING_TYPE_SENSOR
+	kDMThingTypeGroup = 4, // @ C04_THING_TYPE_GROUP
 	kDMThingTypeWeapon = 5, // @ C05_THING_TYPE_WEAPON
 	kDMThingTypeArmour = 6, // @ C06_THING_TYPE_ARMOUR
-	kDMThingTypeScroll = 7,  // @ C07_THING_TYPE_SCROLL     
-	kDMThingTypePotion = 8,  // @ C08_THING_TYPE_POTION     
-	kDMThingTypeContainer = 9,  // @ C09_THING_TYPE_CONTAINER  
-	kDMThingTypeJunk = 10,  // @ C10_THING_TYPE_JUNK      
+	kDMThingTypeScroll = 7,  // @ C07_THING_TYPE_SCROLL
+	kDMThingTypePotion = 8,  // @ C08_THING_TYPE_POTION
+	kDMThingTypeContainer = 9,  // @ C09_THING_TYPE_CONTAINER
+	kDMThingTypeJunk = 10,  // @ C10_THING_TYPE_JUNK
 	kDMThingTypeProjectile = 14,  // @ C14_THING_TYPE_PROJECTILE
-	kDMThingTypeExplosion = 15,  // @ C15_THING_TYPE_EXPLOSION 
+	kDMThingTypeExplosion = 15,  // @ C15_THING_TYPE_EXPLOSION
 	kDMThingTypeTotal = 16 // +1 than the last (explosionThingType)
 }; // @ C[00..15]_THING_TYPE_...
 
 enum Cell {
-	kDMCellAny = -1, // @ CM1_CELL_ANY      
-	kDMCellNorthWest = 0, // @ C00_CELL_NORTHWEST 
-	kDMCellNorthEast = 1, // @ C01_CELL_NORTHEAST 
-	kDMCellSouthEast = 2, // @ C02_CELL_SOUTHEAST 
-	kDMCellSouthWest = 3 // @ C03_CELL_SOUTHWEST 
+	kDMCellAny = -1, // @ CM1_CELL_ANY
+	kDMCellNorthWest = 0, // @ C00_CELL_NORTHWEST
+	kDMCellNorthEast = 1, // @ C01_CELL_NORTHEAST
+	kDMCellSouthEast = 2, // @ C02_CELL_SOUTHEAST
+	kDMCellSouthWest = 3 // @ C03_CELL_SOUTHWEST
 };
 
 enum GameMode {
-	kDMModeLoadSavedGame = 0, // @ C000_MODE_LOAD_SAVED_GAME        
-	kDMModeLoadDungeon = 1, // @ C001_MODE_LOAD_DUNGEON           
-	kDMModeWaitingOnEntrance = 99, // @ C099_MODE_WAITING_ON_ENTRANCE   
-	kDMModeEntranceDrawCredits = 202 // @ C202_MODE_ENTRANCE_DRAW_CREDITS 
+	kDMModeLoadSavedGame = 0, // @ C000_MODE_LOAD_SAVED_GAME
+	kDMModeLoadDungeon = 1, // @ C001_MODE_LOAD_DUNGEON
+	kDMModeWaitingOnEntrance = 99, // @ C099_MODE_WAITING_ON_ENTRANCE
+	kDMModeEntranceDrawCredits = 202 // @ C202_MODE_ENTRANCE_DRAW_CREDITS
 };
 
 enum LoadgameResult {
@@ -141,15 +141,15 @@ enum LoadgameResult {
 };
 
 enum MapIndice {
-	kDMMapIndexNone = -1, // @ CM1_MAP_INDEX_NONE       
-	kDMMapIndexEntrance = 255 // @ C255_MAP_INDEX_ENTRANCE 
+	kDMMapIndexNone = -1, // @ CM1_MAP_INDEX_NONE
+	kDMMapIndexEntrance = 255 // @ C255_MAP_INDEX_ENTRANCE
 };
 
 #define kDMMaskDecodeEvenIfInvisible 0x8000 // @ MASK0x8000_DECODE_EVEN_IF_INVISIBLE
 #define kDMMaskMergeCycles 0x8000 // @ MASK0x8000_MERGE_CYCLES
 
-#define kDMSlotBoxInventoryFirstSlot 8  // @ C08_SLOT_BOX_INVENTORY_FIRST_SLOT   
-#define kDMSlotBoxInventoryActionHand 9 // @ C09_SLOT_BOX_INVENTORY_ACTION_HAND  
+#define kDMSlotBoxInventoryFirstSlot 8  // @ C08_SLOT_BOX_INVENTORY_FIRST_SLOT
+#define kDMSlotBoxInventoryActionHand 9 // @ C09_SLOT_BOX_INVENTORY_ACTION_HAND
 #define kDMSlotBoxChestFirstSlot 38     // @ C38_SLOT_BOX_CHEST_FIRST_SLOT
 
 struct DMADGameDescription {
@@ -169,19 +169,19 @@ public:
 	uint16 _data;
 	static const Thing _none; // @ C0xFFFF_THING_NONE
 	static const Thing _endOfList; // @ C0xFFFE_THING_ENDOFLIST
-	static const Thing _firstExplosion; // @ C0xFF80_THING_FIRST_EXPLOSION            
-	static const Thing _explFireBall; // @ C0xFF80_THING_EXPLOSION_FIREBALL         
-	static const Thing _explSlime; // @ C0xFF81_THING_EXPLOSION_SLIME            
-	static const Thing _explLightningBolt; // @ C0xFF82_THING_EXPLOSION_LIGHTNING_BOLT   
+	static const Thing _firstExplosion; // @ C0xFF80_THING_FIRST_EXPLOSION
+	static const Thing _explFireBall; // @ C0xFF80_THING_EXPLOSION_FIREBALL
+	static const Thing _explSlime; // @ C0xFF81_THING_EXPLOSION_SLIME
+	static const Thing _explLightningBolt; // @ C0xFF82_THING_EXPLOSION_LIGHTNING_BOLT
 	static const Thing _explHarmNonMaterial; // @ C0xFF83_THING_EXPLOSION_HARM_NON_MATERIAL
-	static const Thing _explOpenDoor; // @ C0xFF84_THING_EXPLOSION_OPEN_DOOR        
-	static const Thing _explPoisonBolt; // @ C0xFF86_THING_EXPLOSION_POISON_BOLT      
-	static const Thing _explPoisonCloud; // @ C0xFF87_THING_EXPLOSION_POISON_CLOUD     
-	static const Thing _explSmoke; // @ C0xFFA8_THING_EXPLOSION_SMOKE            
-	static const Thing _explFluxcage; // @ C0xFFB2_THING_EXPLOSION_FLUXCAGE         
-	static const Thing _explRebirthStep1; // @ C0xFFE4_THING_EXPLOSION_REBIRTH_STEP1    
-	static const Thing _explRebirthStep2; // @ C0xFFE5_THING_EXPLOSION_REBIRTH_STEP2    
-	static const Thing _party; // @ C0xFFFF_THING_PARTY  
+	static const Thing _explOpenDoor; // @ C0xFF84_THING_EXPLOSION_OPEN_DOOR
+	static const Thing _explPoisonBolt; // @ C0xFF86_THING_EXPLOSION_POISON_BOLT
+	static const Thing _explPoisonCloud; // @ C0xFF87_THING_EXPLOSION_POISON_CLOUD
+	static const Thing _explSmoke; // @ C0xFFA8_THING_EXPLOSION_SMOKE
+	static const Thing _explFluxcage; // @ C0xFFB2_THING_EXPLOSION_FLUXCAGE
+	static const Thing _explRebirthStep1; // @ C0xFFE4_THING_EXPLOSION_REBIRTH_STEP1
+	static const Thing _explRebirthStep2; // @ C0xFFE5_THING_EXPLOSION_REBIRTH_STEP2
+	static const Thing _party; // @ C0xFFFF_THING_PARTY
 
 	Thing() : _data(0) {}
 	Thing(const Thing &other) { set(other._data); }
@@ -278,7 +278,7 @@ private:
 	byte *_entranceDoorAnimSteps[10]; // @ G0562_apuc_Bitmap_EntranceDoorAnimationSteps
 	byte *_interfaceCredits; // @ G0564_puc_Graphic5_InterfaceCredits
 	Common::RandomSource *_rnd;
-	
+
 	byte *_savedScreenForOpenEntranceDoors; // ad-hoc HACK
 	const DMADGameDescription *_gameVersion;
 	bool _canLoadFromGMM;
diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index 325f7568ab..796413a48b 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -528,19 +528,19 @@ void DungeonMan::decompressDungeonFile() {
 
 const Thing Thing::_none(0); // @ C0xFFFF_THING_NONE
 const Thing Thing::_endOfList(0xFFFE); // @ C0xFFFE_THING_ENDOFLIST
-const Thing Thing::_firstExplosion(0xFF80); // @ C0xFF80_THING_FIRST_EXPLOSION            
-const Thing Thing::_explFireBall(0xFF80); // @ C0xFF80_THING_EXPLOSION_FIREBALL         
-const Thing Thing::_explSlime(0xFF81); // @ C0xFF81_THING_EXPLOSION_SLIME            
-const Thing Thing::_explLightningBolt(0xFF82); // @ C0xFF82_THING_EXPLOSION_LIGHTNING_BOLT   
+const Thing Thing::_firstExplosion(0xFF80); // @ C0xFF80_THING_FIRST_EXPLOSION
+const Thing Thing::_explFireBall(0xFF80); // @ C0xFF80_THING_EXPLOSION_FIREBALL
+const Thing Thing::_explSlime(0xFF81); // @ C0xFF81_THING_EXPLOSION_SLIME
+const Thing Thing::_explLightningBolt(0xFF82); // @ C0xFF82_THING_EXPLOSION_LIGHTNING_BOLT
 const Thing Thing::_explHarmNonMaterial(0xFF83); // @ C0xFF83_THING_EXPLOSION_HARM_NON_MATERIAL
-const Thing Thing::_explOpenDoor(0xFF84); // @ C0xFF84_THING_EXPLOSION_OPEN_DOOR        
-const Thing Thing::_explPoisonBolt(0xFF86); // @ C0xFF86_THING_EXPLOSION_POISON_BOLT      
-const Thing Thing::_explPoisonCloud(0xFF87); // @ C0xFF87_THING_EXPLOSION_POISON_CLOUD     
-const Thing Thing::_explSmoke(0xFFA8); // @ C0xFFA8_THING_EXPLOSION_SMOKE            
-const Thing Thing::_explFluxcage(0xFFB2); // @ C0xFFB2_THING_EXPLOSION_FLUXCAGE         
-const Thing Thing::_explRebirthStep1(0xFFE4); // @ C0xFFE4_THING_EXPLOSION_REBIRTH_STEP1    
-const Thing Thing::_explRebirthStep2(0xFFE5); // @ C0xFFE5_THING_EXPLOSION_REBIRTH_STEP2    
-const Thing Thing::_party(0xFFFF); // @ C0xFFFF_THING_PARTY          
+const Thing Thing::_explOpenDoor(0xFF84); // @ C0xFF84_THING_EXPLOSION_OPEN_DOOR
+const Thing Thing::_explPoisonBolt(0xFF86); // @ C0xFF86_THING_EXPLOSION_POISON_BOLT
+const Thing Thing::_explPoisonCloud(0xFF87); // @ C0xFF87_THING_EXPLOSION_POISON_CLOUD
+const Thing Thing::_explSmoke(0xFFA8); // @ C0xFFA8_THING_EXPLOSION_SMOKE
+const Thing Thing::_explFluxcage(0xFFB2); // @ C0xFFB2_THING_EXPLOSION_FLUXCAGE
+const Thing Thing::_explRebirthStep1(0xFFE4); // @ C0xFFE4_THING_EXPLOSION_REBIRTH_STEP1
+const Thing Thing::_explRebirthStep2(0xFFE5); // @ C0xFFE5_THING_EXPLOSION_REBIRTH_STEP2
+const Thing Thing::_party(0xFFFF); // @ C0xFFFF_THING_PARTY
 
 void DungeonMan::loadDungeonFile(Common::InSaveFile *file) {
 	static const byte additionalThingCounts[16] = { // @ G0236_auc_Graphic559_AdditionalThingCounts{
@@ -567,7 +567,7 @@ void DungeonMan::loadDungeonFile(Common::InSaveFile *file) {
 
 	Common::ReadStream *dunDataStream = nullptr;
 	if (file) {
-		// if loading a save 
+		// if loading a save
 		dunDataStream = file;
 	} else {
 		// else read dungeon.dat
@@ -606,7 +606,7 @@ void DungeonMan::loadDungeonFile(Common::InSaveFile *file) {
 		dunDataStream->readUint32BE(); // discard 4 bytes
 		_dungeonMaps[i]._offsetMapX = dunDataStream->readByte();
 		_dungeonMaps[i]._offsetMapY = dunDataStream->readByte();
-		
+
 		uint16 tmp = dunDataStream->readUint16BE();
 		_dungeonMaps[i]._height = tmp >> 11;
 		_dungeonMaps[i]._width = (tmp >> 6) & 0x1F;
@@ -695,7 +695,7 @@ void DungeonMan::loadDungeonFile(Common::InSaveFile *file) {
 			_thingData[thingType] = new uint16[_dungeonFileHeader._thingCounts[thingType] * thingStoreWordCount];
 		}
 
-		if ((thingType == kDMThingTypeGroup || thingType == kDMThingTypeProjectile) && !file) { // !file because save files have diff. structure than dungeon.dat 
+		if ((thingType == kDMThingTypeGroup || thingType == kDMThingTypeProjectile) && !file) { // !file because save files have diff. structure than dungeon.dat
 			for (uint16 i = 0; i < thingCount; ++i) {
 				uint16 *nextSlot = _thingData[thingType] + i *thingStoreWordCount;
 				for (uint16 j = 0; j < thingStoreWordCount; ++j) {
@@ -846,7 +846,7 @@ Thing DungeonMan::getSquareFirstThing(int16 mapX, int16 mapY) {
 	return _squareFirstThings[index];
 }
 
-void DungeonMan::setSquareAspect(uint16 *aspectArray, Direction dir, int16 mapX, int16 mapY) {	
+void DungeonMan::setSquareAspect(uint16 *aspectArray, Direction dir, int16 mapX, int16 mapY) {
 	unsigned char L0307_uc_Multiple;
 #define AL0307_uc_Square            L0307_uc_Multiple
 #define AL0307_uc_FootprintsAllowed L0307_uc_Multiple
@@ -889,7 +889,7 @@ void DungeonMan::setSquareAspect(uint16 *aspectArray, Direction dir, int16 mapX,
 		default:
 			assert(false);
 		}
-		_vm->_displayMan->_championPortraitOrdinal = 0; 
+		_vm->_displayMan->_championPortraitOrdinal = 0;
 		squareIsFakeWall = false;
 T0172010_ClosedFakeWall:
 		setSquareAspectOrnOrdinals(aspectArray, leftRandomWallOrnamentAllowed, frontRandomWallOrnamentAllowed, rightRandomWallOrnamentAllowed, dir, mapX, mapY, squareIsFakeWall);
@@ -1432,7 +1432,7 @@ Thing DungeonMan::getDiscardThing(uint16 thingType) {
 		uint16 mapHeight = _dungeonMaps[mapIndex]._height;
 		byte *currSquare = _dungeonMapData[mapIndex][0];
 		Thing *squareFirstThing = &_squareFirstThings[_dungeonColumnsCumulativeSquareThingCount[_dungeonMapsFirstColumnIndex[mapIndex]]];
-		
+
 		for (int16 currMapX = 0; currMapX <= mapWidth; currMapX++) {
 			for (int16 currMapY = 0; currMapY <= mapHeight; currMapY++) {
 				if (getFlag(*currSquare++, kDMSquareMaskThingListPresent)) {
diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h
index 7558ece938..826333e1df 100644
--- a/engines/dm/eventman.h
+++ b/engines/dm/eventman.h
@@ -189,14 +189,14 @@ public:
 
 class DMEngine;
 
-#define k0_pointerArrow 0 // @ C0_POINTER_ARROW 
-#define k1_pointerHand 1 // @ C1_POINTER_HAND  
-
-#define k0_pointerTypeArrow 0 // @ C0_POINTER_TYPE_ARROW         
-#define k1_pointerTypeObjectIcon 1 // @ C1_POINTER_TYPE_OBJECT_ICON   
-#define k2_pointerTypeChampionIcon 2 // @ C2_POINTER_TYPE_CHAMPION_ICON 
-#define k3_pointerTypeHand 3 // @ C3_POINTER_TYPE_HAND          
-#define k4_pointerTypeAutoselect 4 // @ C4_POINTER_TYPE_AUTOSELECT    
+#define k0_pointerArrow 0 // @ C0_POINTER_ARROW
+#define k1_pointerHand 1 // @ C1_POINTER_HAND
+
+#define k0_pointerTypeArrow 0 // @ C0_POINTER_TYPE_ARROW
+#define k1_pointerTypeObjectIcon 1 // @ C1_POINTER_TYPE_OBJECT_ICON
+#define k2_pointerTypeChampionIcon 2 // @ C2_POINTER_TYPE_CHAMPION_ICON
+#define k3_pointerTypeHand 3 // @ C3_POINTER_TYPE_HAND
+#define k4_pointerTypeAutoselect 4 // @ C4_POINTER_TYPE_AUTOSELECT
 
 class EventManager {
 	DMEngine *_vm;
diff --git a/engines/dm/group.h b/engines/dm/group.h
index ef34db1e5c..f182c61123 100644
--- a/engines/dm/group.h
+++ b/engines/dm/group.h
@@ -39,39 +39,39 @@ namespace DM {
 
 /* Creature types */
 enum CreatureType {
-	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                     
-	kDMCreatureTypeMagentaWorm = 15, // @ C15_CREATURE_MAGENTA_WORM_WORM          
-	kDMCreatureTypeAntman = 16, // @ C16_CREATURE_TROLIN_ANTMAN              
-	kDMCreatureTypeGiantWasp = 17, // @ C17_CREATURE_GIANT_WASP_MUNCHER         
+	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
+	kDMCreatureTypeMagentaWorm = 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                  
+	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
 };
 
 enum CreatureSize {
 	kDMCreatureSizeQuarter = 0, // @ C0_SIZE_QUARTER_SQUARE
-	kDMCreatureSizeHalf = 1,    // @ C1_SIZE_HALF_SQUARE   
-	kDMCreatureSizeFull = 2     // @ C2_SIZE_FULL_SQUARE   
+	kDMCreatureSizeHalf = 1,    // @ C1_SIZE_HALF_SQUARE
+	kDMCreatureSizeFull = 2     // @ C2_SIZE_FULL_SQUARE
 };
 
 enum Behavior {
@@ -86,27 +86,27 @@ enum Behavior {
 
 #define kDMImmuneToFear 15 // @ C15_IMMUNE_TO_FEAR
 #define kDMMovementTicksImmobile 255 // @ C255_IMMOBILE
-#define kDMWholeCreatureGroup -1 // @ CM1_WHOLE_CREATURE_GROUP 
+#define kDMWholeCreatureGroup -1 // @ CM1_WHOLE_CREATURE_GROUP
 #define kDMCreatureTypeSingleCenteredCreature 255 // @ C255_SINGLE_CENTERED_CREATURE
 
 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   
+	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  
+	kDMCreatureMaskSeeInvisible = 0x0800,   // @ MASK0x0800_SEE_INVISIBLE
+	kDMCreatureMaskNightVision = 0x1000,    // @ MASK0x1000_NIGHT_VISION
+	kDMCreatureMaskArchenemy = 0x2000,      // @ MASK0x2000_ARCHENEMY
+	kDMCreatureMaskMagicMap = 0x4000        // @ MASK0x4000_MAGICMAP
 };
 
 enum aspectMask {
-	kDMAspectMaskActiveGroupFlipBitmap = 0x0040, // @ MASK0x0040_FLIP_BITMAP  
-	kDMAspectMaskActiveGroupIsAttacking = 0x0080 // @ MASK0x0080_IS_ATTACKING 
+	kDMAspectMaskActiveGroupFlipBitmap = 0x0040, // @ MASK0x0040_FLIP_BITMAP
+	kDMAspectMaskActiveGroupIsAttacking = 0x0080 // @ MASK0x0080_IS_ATTACKING
 };
 
 class ActiveGroup {
diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h
index 8819e5b109..92013fd0e7 100644
--- a/engines/dm/inventory.h
+++ b/engines/dm/inventory.h
@@ -37,9 +37,9 @@ namespace DM {
 
 enum DescriptionMask {
 	kDMDescriptionMaskConsumable = 0x0001, // @ MASK0x0001_DESCRIPTION_CONSUMABLE
-	kDMDescriptionMaskPoisoned = 0x0002, // @ MASK0x0002_DESCRIPTION_POISONED  
-	kDMDescriptionMaskBroken = 0x0004, // @ MASK0x0004_DESCRIPTION_BROKEN    
-	kDMDescriptionMaskCursed = 0x0008 // @ MASK0x0008_DESCRIPTION_CURSED    
+	kDMDescriptionMaskPoisoned = 0x0002, // @ MASK0x0002_DESCRIPTION_POISONED
+	kDMDescriptionMaskBroken = 0x0004, // @ MASK0x0004_DESCRIPTION_BROKEN
+	kDMDescriptionMaskCursed = 0x0008 // @ MASK0x0008_DESCRIPTION_CURSED
 };
 
 enum PanelContent {
@@ -60,7 +60,7 @@ public:
 	explicit InventoryMan(DMEngine *vm);
 
 	int16 _inventoryChampionOrdinal; // @ G0423_i_InventoryChampionOrdinal
-	PanelContent _panelContent; // @ G0424_i_PanelContent 
+	PanelContent _panelContent; // @ G0424_i_PanelContent
 	Thing _chestSlots[8]; // @ G0425_aT_ChestSlots
 	Thing _openChest; // @ G0426_T_OpenChest
 	int16 _objDescTextXpos; // @ G0421_i_ObjectDescriptionTextX
@@ -71,7 +71,7 @@ public:
 	void toggleInventory(ChampionIndex championIndex); // @ F0355_INVENTORY_Toggle_CPSE
 	void drawStatusBoxPortrait(ChampionIndex championIndex); // @ F0354_INVENTORY_DrawStatusBoxPortrait
 	void drawPanelHorizontalBar(int16 x, int16 y, int16 pixelWidth, Color color); // @ F0343_INVENTORY_DrawPanel_HorizontalBar
-	void drawPanelFoodOrWaterBar(int16 amount, int16 y, Color color); // @ F0344_INVENTORY_DrawPanel_FoodOrWaterBar 
+	void drawPanelFoodOrWaterBar(int16 amount, int16 y, Color color); // @ F0344_INVENTORY_DrawPanel_FoodOrWaterBar
 	void drawPanelFoodWaterPoisoned(); // @ F0345_INVENTORY_DrawPanel_FoodWaterPoisoned
 	void drawPanelResurrectReincarnate(); // @ F0346_INVENTORY_DrawPanel_ResurrectReincarnate
 	void drawPanel(); // @ F0347_INVENTORY_DrawPanel
diff --git a/engines/dm/menus.h b/engines/dm/menus.h
index 551fbda793..1964454717 100644
--- a/engines/dm/menus.h
+++ b/engines/dm/menus.h
@@ -35,8 +35,8 @@
 namespace DM {
 
 enum Damage {
-	kDMDamageCantReach = -1,   // @ CM1_DAMAGE_CANT_REACH    
-	kDMDamageNoAmmunition = -2 // @ CM2_DAMAGE_NO_AMMUNITION 
+	kDMDamageCantReach = -1,   // @ CM1_DAMAGE_CANT_REACH
+	kDMDamageNoAmmunition = -2 // @ CM2_DAMAGE_NO_AMMUNITION
 };
 
 enum SpellArea {
@@ -45,8 +45,8 @@ enum SpellArea {
 };
 
 enum ActionMask {
-	kDMActionMaskRequiresCharge = 0x0080,         // @ MASK0x0080_ACTION_REQUIRES_CHARGE 
-	kDMActionMaskHitNonMaterialCreatures = 0x8000 // @ MASK0x8000_HIT_NON_MATERIAL_CREATURES 
+	kDMActionMaskRequiresCharge = 0x0080,         // @ MASK0x0080_ACTION_REQUIRES_CHARGE
+	kDMActionMaskHitNonMaterialCreatures = 0x8000 // @ MASK0x8000_HIT_NON_MATERIAL_CREATURES
 };
 
 class ActionList {
@@ -129,7 +129,7 @@ public:
 	Box _boxActionArea3ActionMenu; // @ G0499_s_Graphic560_Box_ActionArea3ActionsMenu
 	Box _boxActionArea2ActionMenu; // @ G0500_s_Graphic560_Box_ActionArea2ActionsMenu
 	Box _boxActionArea1ActionMenu; // @ G0501_s_Graphic560_Box_ActionArea1ActionMenu
-	Box _boxActionArea; // @ G0001_s_Graphic562_Box_ActionArea 
+	Box _boxActionArea; // @ G0001_s_Graphic562_Box_ActionArea
 	Box _boxSpellArea;
 	unsigned char _actionSkillIndex[44]; // @ G0496_auc_Graphic560_ActionSkillIndex
 	unsigned char _actionDisabledTicks[44];
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp
index 20e3ceb2ad..face711e52 100644
--- a/engines/dm/objectman.cpp
+++ b/engines/dm/objectman.cpp
@@ -265,7 +265,7 @@ IconIndice ObjectMan::getIconIndexInSlotBox(uint16 slotBoxIndex) {
 }
 
 void ObjectMan::clearLeaderObjectName() {
-	static Box boxLeaderHandObjectName(233, 319, 33, 38); // @ G0028_s_Graphic562_Box_LeaderHandObjectName 
+	static Box boxLeaderHandObjectName(233, 319, 33, 38); // @ G0028_s_Graphic562_Box_LeaderHandObjectName
 	_vm->_displayMan->fillScreenBox(boxLeaderHandObjectName, kDMColorBlack);
 }
 
diff --git a/engines/dm/projexpl.h b/engines/dm/projexpl.h
index ad39609a16..d7b598a934 100644
--- a/engines/dm/projexpl.h
+++ b/engines/dm/projexpl.h
@@ -32,9 +32,9 @@
 namespace DM {
 
 enum KillOutcome {
-	kDMKillOutcomeNoCreaturesInGroup = 0,   // @ C0_OUTCOME_KILLED_NO_CREATURES_IN_GROUP   
-	kDMKillOutcomeSomeCreaturesInGroup = 1, // @ C1_OUTCOME_KILLED_SOME_CREATURES_IN_GROUP 
-	kDMKillOutcomeAllCreaturesInGroup = 2   // @ C2_OUTCOME_KILLED_ALL_CREATURES_IN_GROUP  
+	kDMKillOutcomeNoCreaturesInGroup = 0,   // @ C0_OUTCOME_KILLED_NO_CREATURES_IN_GROUP
+	kDMKillOutcomeSomeCreaturesInGroup = 1, // @ C1_OUTCOME_KILLED_SOME_CREATURES_IN_GROUP
+	kDMKillOutcomeAllCreaturesInGroup = 2   // @ C2_OUTCOME_KILLED_ALL_CREATURES_IN_GROUP
 };
 
 class TimelineEvent;