From 7b3672517cb1953eea7cdeadf6bf3c4b38e59161 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Wed, 23 Oct 2019 01:14:37 +0100 Subject: [PATCH] CRUISE: Correct Parameter Sanity Checks in Several Functions This was flagged by GCC -Wlogical-op as the inverted logical operation was causing these checks to always return true. --- engines/cruise/function.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 3f794c4e70b..18dcaeeb508 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -508,7 +508,7 @@ int16 Op_LoadBackground() { bgIdx = popVar(); - if (bgIdx >= 0 || bgIdx < NBSCREENS) { + if (bgIdx >= 0 && bgIdx < NBSCREENS) { strToUpper(bgName); gfxModuleData_gfxWaitVSync(); @@ -553,7 +553,7 @@ int16 Op_LoadFrame() { param2 = popVar(); param3 = popVar(); - if (param3 >= 0 || param3 < NUM_FILE_ENTRIES) { + if (param3 >= 0 && param3 < NUM_FILE_ENTRIES) { strToUpper(name); gfxModuleData_gfxWaitVSync();