[Scummvm-git-logs] scummvm master -> 2c5cdfb37e1264e8985bb4e81d89103a0e46b929

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2c5cdfb37e SUPERNOVA: Fix Reported MSVC Compiler Warnings


Commit: 2c5cdfb37e1264e8985bb4e81d89103a0e46b929
    https://github.com/scummvm/scummvm/commit/2c5cdfb37e1264e8985bb4e81d89103a0e46b929
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-13T23:20:31+01:00

Commit Message:
SUPERNOVA: Fix Reported MSVC Compiler Warnings

These are from Henke37 via IRC.

Changed paths:
    engines/supernova/game-manager.cpp
    engines/supernova/supernova.cpp
    engines/supernova/supernova2/rooms.cpp


diff --git a/engines/supernova/game-manager.cpp b/engines/supernova/game-manager.cpp
index bf4cbc6..7e44882 100644
--- a/engines/supernova/game-manager.cpp
+++ b/engines/supernova/game-manager.cpp
@@ -834,7 +834,7 @@ void GameManager::edit(Common::String &input, int x, int y, uint length) {
 	bool isEditing = true;
 	uint cursorIndex = input.size();
 	// NOTE: Pixels for char needed = kFontWidth + 2px left and right side bearing
-	int overdrawWidth;
+	int overdrawWidth = 0;
 	Color background = kColorBlack;
 
 	if (_vm->_MSPart == 1) {
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index b8c9adb..41f05ed 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -475,7 +475,7 @@ Common::SeekableReadStream *SupernovaEngine::getBlockFromDatFile(Common::String
 		return nullptr;
 	}
 
-	uint32 gameBlockSize;
+	uint32 gameBlockSize = 0;
 	while (!f.eos()) {
 		int part = f.readByte();
 		gameBlockSize = f.readUint32LE();
diff --git a/engines/supernova/supernova2/rooms.cpp b/engines/supernova/supernova2/rooms.cpp
index b058f04..cc4ab85 100644
--- a/engines/supernova/supernova2/rooms.cpp
+++ b/engines/supernova/supernova2/rooms.cpp
@@ -3582,7 +3582,7 @@ bool BstDoor::interact(Action verb, Object &obj1, Object &obj2) {
 			_vm->renderImage(number);
 		_vm->playSound(kAudioTaxiOpen);
 		for (number = 1; number <= 16; number++) {
-			if (isSectionVisible(number) != _password[number - 1])
+			if (isSectionVisible(number) != (bool)_password[number - 1])
 				return true;
 		}
 		_gm->wait(2);