diff options
| author | Eugene Sandulenko | 2008-04-07 20:24:40 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2008-04-07 20:24:40 +0000 |
| commit | 732774fd8de3cb6cebcd78730813d26e0330e66e (patch) | |
| tree | 4576a02c29f1b62ad4da8c49c3225096dba256aa /engines/cine/object.cpp | |
| parent | 9377fc7dc8548eb5369c99f5ab3e2437e756a003 (diff) | |
| download | scummvm-rg350-732774fd8de3cb6cebcd78730813d26e0330e66e.tar.gz scummvm-rg350-732774fd8de3cb6cebcd78730813d26e0330e66e.tar.bz2 scummvm-rg350-732774fd8de3cb6cebcd78730813d26e0330e66e.zip | |
Patch #1913862: "CinE Script system"
svn-id: r31444
Diffstat (limited to 'engines/cine/object.cpp')
| -rw-r--r-- | engines/cine/object.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 59adae6fc9..bba1c094f1 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -231,7 +231,9 @@ void modifyObjectParam(byte objIdx, byte paramIdx, int16 newValue) { objectTable[objIdx].frame = newValue; break; case 4: - if (newValue == -1) { + // is it really in Future Wars? it breaks the newspaper machine + // on the airport in Operation Stealth + if (newValue == -1 && g_cine->getGameType() != Cine::GType_OS) { objectTable[objIdx].costume = globalVars[0]; } else { objectTable[objIdx].costume = newValue; @@ -243,8 +245,8 @@ void modifyObjectParam(byte objIdx, byte paramIdx, int16 newValue) { } } -byte compareObjectParam(byte objIdx, byte type, int16 value) { - byte compareResult = 0; +uint16 compareObjectParam(byte objIdx, byte type, int16 value) { + uint16 compareResult = 0; int16 objectParam = getObjectParam(objIdx, type); if (objectParam > value) { |