diff options
| author | Johannes Schickel | 2011-07-27 15:34:55 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-27 15:34:55 +0200 |
| commit | ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8 (patch) | |
| tree | d71a8f3b5325080f3589ba196a7d3adcb66ad164 /engines/composer | |
| parent | 108bdab4ac072657f7420506b39ad24cca288cc4 (diff) | |
| download | scummvm-rg350-ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8.tar.gz scummvm-rg350-ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8.tar.bz2 scummvm-rg350-ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8.zip | |
COMPOSER: Fix clang warnings.
Diffstat (limited to 'engines/composer')
| -rw-r--r-- | engines/composer/resource.h | 2 | ||||
| -rw-r--r-- | engines/composer/scripting.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/engines/composer/resource.h b/engines/composer/resource.h index f97a628933..9408cdffb8 100644 --- a/engines/composer/resource.h +++ b/engines/composer/resource.h @@ -31,7 +31,7 @@ namespace Composer { -class Animation; +struct Animation; #define ID_LBRC MKTAG('L','B','R','C') // Main FourCC diff --git a/engines/composer/scripting.cpp b/engines/composer/scripting.cpp index 470780583a..d85bd524e0 100644 --- a/engines/composer/scripting.cpp +++ b/engines/composer/scripting.cpp @@ -629,8 +629,6 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1 } if (param3 == 0) param3 = 1000; - else - param3 = param3; if (param2 < 0 || param3 < 0 || param2 + param3 > 1000) error("can't read %d entries into %d from file '%s' for vars id '%d'", param3, param2, filename.c_str(), param1); stream->skip(param2 * 2); @@ -696,8 +694,6 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1 error("couldn't open '%s' to get data id '%d'", filename.c_str(), param1); if (param3 == 0) param3 = 1000; - else - param3 = param3; if (param2 < 0 || param3 < 0 || param2 + param3 > 1000) error("can't read %d entries into %d from file '%s' for data id '%d'", param3, param2, filename.c_str(), param1); for (uint i = 0; i < (uint)param3; i++) { |