aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamieson Christian2003-05-19 15:40:34 +0000
committerJamieson Christian2003-05-19 15:40:34 +0000
commit5a89820f0deb8bdee8677bd82304acd355d05597 (patch)
tree9d879f41c85201d3cde4bc70769106d2da02049f
parentec4cc7d774450b1877b18b2e13a6ff7e8f19d25d (diff)
downloadscummvm-rg350-5a89820f0deb8bdee8677bd82304acd355d05597.tar.gz
scummvm-rg350-5a89820f0deb8bdee8677bd82304acd355d05597.tar.bz2
scummvm-rg350-5a89820f0deb8bdee8677bd82304acd355d05597.zip
Fixed VC++ warnings
svn-id: r7690
-rw-r--r--scumm/script_v5.cpp2
-rw-r--r--scumm/script_v6.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 37690e9d2d..cd8e8a1bff 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2080,7 +2080,7 @@ void Scumm_v5::o5_startScript() {
if (op & 0x20)
a = 1;
- runScript(script, a, b, data);
+ runScript(script, a != 0, b != 0, data);
}
void Scumm_v5::o5_stopObjectCode() {
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 9e73e40fd8..085aee3abd 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -686,7 +686,7 @@ void Scumm_v6::o6_startScriptEx() {
getStackList(args, ARRAYSIZE(args));
script = pop();
flags = pop();
- runScript(script, flags & 1, flags & 2, args);
+ runScript(script, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_jumpToScript() {
@@ -697,7 +697,7 @@ void Scumm_v6::o6_jumpToScript() {
script = pop();
flags = pop();
stopObjectCode();
- runScript(script, flags & 1, flags & 2, args);
+ runScript(script, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_startScript() {
@@ -724,7 +724,7 @@ void Scumm_v6::o6_startObjectEx() {
entryp = pop();
script = pop();
flags = pop();
- runVerbCode(script, entryp, flags & 1, flags & 2, args);
+ runVerbCode(script, entryp, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_startObjectQuick() {