aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-10-06 06:47:01 +0000
committerPaweł Kołodziejski2002-10-06 06:47:01 +0000
commit9560ba224cbafdbd6564920cc54c29029cff9f54 (patch)
tree42410e1a2a451ecbea98e5a106af78e9f84cc2e1 /scumm
parent79b95b6732b9d9ef7d7cfd08a6421a992b12d6fc (diff)
downloadscummvm-rg350-9560ba224cbafdbd6564920cc54c29029cff9f54.tar.gz
scummvm-rg350-9560ba224cbafdbd6564920cc54c29029cff9f54.tar.bz2
scummvm-rg350-9560ba224cbafdbd6564920cc54c29029cff9f54.zip
fixed warnings :)
svn-id: r5092
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v2.cpp8
-rw-r--r--scumm/string.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 9c6f6d1faf..9d0b95b663 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -2822,10 +2822,10 @@ void Scumm::o6_miscOps()
} else {
setStringVars(0);
- _string[0].charset = args[1];
- _string[0].color = args[2];
- _string[0].xpos = args[3];
- _string[0].ypos = args[4];
+ _string[0].charset = (byte)args[1];
+ _string[0].color = (byte)args[2];
+ _string[0].xpos = args[3];
+ _string[0].ypos = args[4];
addMessageToStack(getStringAddressVar(VAR_STRING2DRAW));
drawDescString();
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 5612a17a5b..060e4efd71 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -631,7 +631,7 @@ void Scumm::drawString(int a)
charset._left -= charset.getStringWidth(a, buf, 0) >> 1;
}
- if (!_features & GF_AFTER_V7)
+ if (!(_features & GF_AFTER_V7))
charset._ignoreCharsetMask = 1;