DM: Fix some CppCheck warnings

scummvm · Aug 26, 2016 · 59af06f · 59af06f
1 parent 75db418
commit 59af06f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
@@ -41,6 +41,13 @@ DMEngine::DMEngine(OSystem *syst) : Engine(syst), _console(nullptr) {
 	// register random source
 	_rnd = new Common::RandomSource("quux");
 
+	_displayMan = nullptr;
+	_dungeonMan = nullptr;
+	_eventMan = nullptr;
+	_menuMan = nullptr;
+	_stopWaitingForPlayerInput = false;
+	_gameTimeTicking = false;
+
 	debug("DMEngine::DMEngine");
 }
 

diff --git a/engines/dm/dm.h b/engines/dm/dm.h
@@ -55,7 +55,7 @@ class Thing {
 	static const Thing thingNone;
 	static const Thing thingEndOfList;
 
-	Thing() {}
+	Thing() : data(0) {}
 	Thing(uint16 d) { set(d); }
 
 	void set(uint16 d) {

diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
@@ -773,7 +773,7 @@ void DungeonMan::decodeText(char *destString, Thing thing, TextType type) {
 			*destString++ = '\n';
 			sepChar = ' ';
 		} else if (type == kTextTypeInscription) {
-			sepChar = 0x80;
+			sepChar = (char)0x80;
 		} else {
 			sepChar = '\n';
 		}

diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
@@ -218,6 +218,7 @@ EventManager::EventManager(DMEngine *vm) : _vm(vm) {
 	_isCommandQueueLocked = true;
 
 	_dummyMapIndex = 0;
+	_pendingClickButton = kNoneMouseButton;
 }