From c87e3ba0488b10c4dafa7c8d36e99938b22e216a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 19 Jun 2016 19:27:48 +0200
Subject: DM: Fix compilation, fix typos and some comment alignement

---
 engines/dm/champion.cpp   |  4 ++--
 engines/dm/dungeonman.cpp | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index a6b1ff69ba..01f863732f 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -4,7 +4,7 @@
 
 namespace DM {
 
-Box gBoxChampionPortrait = {0, 31, 0, 28}; // @ G0047_s_Graphic562_Box_ChampionPortrait 
+Box gBoxChampionPortrait = Box(0, 31, 0, 28); // @ G0047_s_Graphic562_Box_ChampionPortrait 
 
 ChampionMan::ChampionMan(DMEngine *vm) : _vm(vm) {
 	_leaderIndex = kChampionNone;
@@ -37,7 +37,7 @@ ChampionIndex ChampionMan::getIndexInCell(ViewCell cell) {
 
 void ChampionMan::resetDataToStartGame() {
 	if (!_vm->_dungeonMan->_messages._newGame) {
-		warning("MISSING CODE: stuff for reeseting for loaded games");
+		warning("MISSING CODE: stuff for resetting for loaded games");
 		assert(false);
 	}
 
diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index f93ad0f6cd..1ac9e850be 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -522,12 +522,11 @@ void DungeonMan::decompressDungeonFile() {
 			}
 		}
 	} else {
-		// TODO: if the dungeon is uncompressed, read it here
+		warning("TODO: if the dungeon is uncompressed, read it here");
 	}
 	f.close();
 }
 
-
 uint8 gAdditionalThingCounts[16] = {
 	0,    /* Door */
 	0,    /* Teleporter */
@@ -547,13 +546,13 @@ uint8 gAdditionalThingCounts[16] = {
 	50    /* Explosion */
 }; // @ G0236_auc_Graphic559_AdditionalThingCounts
 
-// this is the number of uint16s the data has to be stored, not the lenght of the data in dungeon.dat!
+// this is the number of uint16s the data has to be stored, not the length of the data in dungeon.dat!
 unsigned char gThingDataWordCount[16] = {
 	2,   /* Door */
 	3,   /* Teleporter */
 	2,   /* Text String */
 	4,   /* Sensor */
-	9,  /* Group */
+	9,   /* Group */
 	2,   /* Weapon */
 	2,   /* Armour */
 	2,   /* Scroll */
@@ -570,7 +569,6 @@ unsigned char gThingDataWordCount[16] = {
 const Thing Thing::_thingNone(0);
 const Thing Thing::_thingEndOfList(0xFFFE);
 
-
 void DungeonMan::loadDungeonFile() {
 	if (_messages._newGame)
 		decompressDungeonFile();
@@ -675,7 +673,6 @@ void DungeonMan::loadDungeonFile() {
 	if (_messages._newGame)
 		_dunData._eventMaximumCount = 100;
 
-
 	// load things
 	for (uint16 thingType = kDoorThingType; thingType < kThingTypeTotal; ++thingType) {
 		uint16 thingCount = _fileHeader._thingCounts[thingType];
@@ -726,10 +723,8 @@ void DungeonMan::loadDungeonFile() {
 				_dunData._thingsData[thingType][thingCount + i][0] = Thing::_thingNone.toUint16();
 			}
 		}
-
 	}
 
-
 	// load map data
 	if (!_messages._restartGameRequest)
 		_rawMapData = _rawDunFileData + dunDataStream.pos();
-- 
cgit v1.2.3