From 5a89820f0deb8bdee8677bd82304acd355d05597 Mon Sep 17 00:00:00 2001 From: Jamieson Christian Date: Mon, 19 May 2003 15:40:34 +0000 Subject: Fixed VC++ warnings svn-id: r7690 --- scumm/script_v5.cpp | 2 +- scumm/script_v6.cpp | 6 +++--- 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() { -- cgit v1.2.3