diff options
author | Matthew Hoops | 2015-06-28 20:04:12 -0400 |
---|---|---|
committer | Matthew Hoops | 2015-06-28 20:05:24 -0400 |
commit | 0ba332493b92e4513c96b78a9f854141db3dcd9c (patch) | |
tree | 1eade554f38aa8f5dd8ddc05c7ac8f8900e36d97 /engines/sherlock | |
parent | 30de61dcce96275b36c42f17f369b2e6e8c35e8e (diff) | |
download | scummvm-rg350-0ba332493b92e4513c96b78a9f854141db3dcd9c.tar.gz scummvm-rg350-0ba332493b92e4513c96b78a9f854141db3dcd9c.tar.bz2 scummvm-rg350-0ba332493b92e4513c96b78a9f854141db3dcd9c.zip |
SHERLOCK: Silence gcc warnings
Diffstat (limited to 'engines/sherlock')
-rw-r--r-- | engines/sherlock/journal.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index ec912af854..a0c9108a55 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 2ea3172b49..2669754061 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) { |