Merge remote branch 'upstream/master' into pegasus

5 files changed, 6 insertions, 6 deletions

diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 2249a49e4d..6ba5597e8a 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -243,7 +243,7 @@ static const DrasculaGameDescription gameDescriptions[] = {
 			GUIO_NONE
 		},
 	},
-	
+
 	{
 		// Drascula French version (ScummVM repacked files)
 		{
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index d133b3609d..9ea20e3e12 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -204,7 +204,7 @@ void DrasculaEngine::copyRect(int xorg, int yorg, int xdes, int ydes, int width,
 		}
 		ptr += 320 - width;
 	}
-		
+
 }
 
 void DrasculaEngine::updateScreen(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *buffer) {
@@ -354,7 +354,7 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 		print_abc(msg, x, y);
 		return;
 	}
-	
+
 	// Message doesn't fit on screen, split it
 
 	// Get a word from the message
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp
index eb36baed18..e3a97087c0 100644
--- a/engines/drascula/interface.cpp
+++ b/engines/drascula/interface.cpp
@@ -159,7 +159,7 @@ void DrasculaEngine::enterName() {
 		key = getScan();
 
 		if (key != 0) {
-			if (key >= 0 && key <= 0xFF && isalpha(key))
+			if (key >= 0 && key <= 0xFF && isalpha(static_cast<unsigned char>(key)))
 				select2[v] = tolower(key);
 			else if ((key >= Common::KEYCODE_0 && key <= Common::KEYCODE_9) || key == Common::KEYCODE_SPACE)
 				select2[v] = key;
diff --git a/engines/drascula/resource.cpp b/engines/drascula/resource.cpp
index bda25113b7..6da43e7cba 100644
--- a/engines/drascula/resource.cpp
+++ b/engines/drascula/resource.cpp
@@ -45,7 +45,7 @@ TextResourceParser::TextResourceParser(Common::SeekableReadStream *stream, Dispo
 	_stream(stream), _dispose(dispose) {
 
 	// NOTE: strangely enough, the code before this refactoring used the size of
-	// the stream as a fixed maximum length for the parser. Using an updated 
+	// the stream as a fixed maximum length for the parser. Using an updated
 	// (size-pos) would make more sense to me, but let's see what the experts say.
 	_maxLen = _stream->size();
 }
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 50d44bab79..9f725b6d76 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -1675,7 +1675,7 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 	if (!stream) {
 		error("missing data file %s", fileName);
 	}
-	
+
 	TextResourceParser p(stream, DisposeAfterUse::YES);
 
 	p.parseInt(roomNumber);