From 579b56d2124fabafd5f99ab6e308c9a286fc14af Mon Sep 17 00:00:00 2001
From: Bendegúz Nagy
Date: Fri, 1 Jul 2016 21:24:22 +0200
Subject: DM: Reversing several modifications and adding missing code
 warninings

Add missing code warnings to DisplayMan::drawSquareD3L  (@F0116_DUNGEONVIEW_DrawSquareD3L)
Add missing annotations to SquareAspectIndice.
Add several Frame globals.
Remove StairIndex, replace DisplayMan::_stairIndices with direct class members.
Refactor Frame into class, make it use Box type.
Add several entries to GraphicIndices type.
---
 engines/dm/dungeonman.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'engines/dm/dungeonman.h')

diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
index dcf1659c79..df56ec229b 100644
--- a/engines/dm/dungeonman.h
+++ b/engines/dm/dungeonman.h
@@ -163,19 +163,20 @@ enum TextType {
 };
 
 enum SquareAspectIndice {
-	kElemAspect = 0,
-	kFirstGroupOrObjectAspect = 1,
-	kRightWallOrnOrdAspect = 2,
-	kFrontWallOrnOrdAspect = 3,
-	kLeftWallOrnOrdAspect = 4,
-	kPitInvisibleAspect = 2,
-	kTeleporterVisibleAspect = 2,
-	kStairsUpAspect = 2,
-	kDoorStateAspect = 2,
-	kDoorThingIndexAspect = 3,
-	kFloorOrnOrdAspect = 4,
-	kFootprintsAspect = 0x8000 // @ MASK0x8000_FOOTPRINTS          
+	kElemAspect = 0, // @ C0_ELEMENT
+	kFirstGroupOrObjectAspect = 1, // @ C1_FIRST_GROUP_OR_OBJECT 
+	kRightWallOrnOrdAspect = 2, // @ C2_RIGHT_WALL_ORNAMENT_ORDINAL 
+	kFrontWallOrnOrdAspect = 3, // @ C3_FRONT_WALL_ORNAMENT_ORDINAL 
+	kLeftWallOrnOrdAspect = 4, // @ C4_LEFT_WALL_ORNAMENT_ORDINAL 
+	kPitInvisibleAspect = 2, // @ C2_PIT_INVISIBLE 
+	kTeleporterVisibleAspect = 2, // @ C2_TELEPORTER_VISIBLE 
+	kStairsUpAspect = 2, // @ C2_STAIRS_UP 
+	kDoorStateAspect = 2, // @ C2_DOOR_STATE 
+	kDoorThingIndexAspect = 3, // @ C3_DOOR_THING_INDEX 
+	kFloorOrnOrdAspect = 4, // @ C4_FLOOR_ORNAMENT_ORDINAL 
+	kFootprintsAspect = 0x8000 // @ MASK0x8000_FOOTPRINTS             
 };
+;
 
                
 
-- 
cgit v1.2.3