thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMPOSER: Fix clang warnings.

Browse source
This commit is contained in:
Johannes Schickel 2011-07-27 15:34:55 +02:00
parent 108bdab4ac
commit ecdd2e5fdc
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/composer/resource.h
View file

@ -31,7 +31,7 @@
namespace Composer {
class Animation;
struct Animation;
#define ID_LBRC MKTAG('L','B','R','C') // Main FourCC

4
engines/composer/scripting.cpp
View file

@ -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++) {