[Scummvm-cvs-logs] scummvm master -> a1e2986056218c8c3f48dd4d9e818730265dc060

[clone2727]

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

Summary:
30de61dcce GROOVIE: Silence a gcc warning
0ba332493b SHERLOCK: Silence gcc warnings
a1e2986056 TINSEL: Silence a gcc warning


Commit: 30de61dcce96275b36c42f17f369b2e6e8c35e8e
    https://github.com/scummvm/scummvm/commit/30de61dcce96275b36c42f17f369b2e6e8c35e8e
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-28T20:05:24-04:00

Commit Message:
GROOVIE: Silence a gcc warning

Changed paths:
    engines/groovie/music.cpp



diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 795a6e6..f72e3e4 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -409,6 +409,8 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String &gtlName)
 				musicType = MT_MT32;
 			}
 			break;
+		default:
+			break;
 		}
 	}
 


Commit: 0ba332493b92e4513c96b78a9f854141db3dcd9c
    https://github.com/scummvm/scummvm/commit/0ba332493b92e4513c96b78a9f854141db3dcd9c
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-28T20:05:24-04:00

Commit Message:
SHERLOCK: Silence gcc warnings

Changed paths:
    engines/sherlock/journal.cpp
    engines/sherlock/scalpel/scalpel_talk.cpp



diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index ec912af..a0c9108 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -235,7 +235,7 @@ bool Journal::drawJournal(int direction, int howFar) {
 
 				// Print out the found keyword
 				Common::String lineMatch(matchP, matchP + _find.size());
-				byte fgColor = IS_SERRATED_SCALPEL ? Scalpel::INV_FOREGROUND : Tattoo::INV_FOREGROUND;
+				byte fgColor = IS_SERRATED_SCALPEL ? (byte)Scalpel::INV_FOREGROUND : (byte)Tattoo::INV_FOREGROUND;
 				screen.gPrint(Common::Point(53 + width, yp), fgColor, "%s", lineMatch.c_str());
 				width += screen.stringWidth(lineMatch.c_str());
 
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 2ea3172..2669754 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -679,7 +679,7 @@ bool ScalpelTalk::displayTalk(bool slamIt) {
 
 		if (statement._talkMap != -1) {
 			bool flag = _talkHistory[_converseNum][idx];
-			lineY = talkLine(idx, statement._talkMap, flag ? TALK_NULL : INV_FOREGROUND,
+			lineY = talkLine(idx, statement._talkMap, flag ? (byte)TALK_NULL : (byte)INV_FOREGROUND,
 				yp, slamIt);
 
 			if (lineY != -1) {


Commit: a1e2986056218c8c3f48dd4d9e818730265dc060
    https://github.com/scummvm/scummvm/commit/a1e2986056218c8c3f48dd4d9e818730265dc060
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-28T20:05:24-04:00

Commit Message:
TINSEL: Silence a gcc warning

Changed paths:
    engines/tinsel/music.cpp



diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 74e28c3..80442b2 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -401,6 +401,8 @@ MidiMusicPlayer::MidiMusicPlayer(TinselEngine *vm) {
 				musicType = MT_MT32;
 			}
 			break;
+		default:
+			break;
 		}
 		if (!_driver) {
 			// nothing got created yet? -> create default driver