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

Added missing return statements.

Browse source 
svn-id: r41473
This commit is contained in:
Nicola Mettifogo 2009-06-12 10:26:15 +00:00
parent 5172c83200
commit 20d75f6ec7
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/kyra/script.cpp
View file

@ -98,6 +98,8 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) {
default:
warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk._type), chunk._size, _filename);
}
return false;
}
bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode*> *opcodes) {
@ -116,10 +118,10 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
Common::Functor1Mem< Common::IFFChunk &, bool, EMCInterpreter > c(this, &EMCInterpreter::callback);
iff.parse(c);
if (!scriptData->ordr)
if (!_scriptData->ordr)
error("No ORDR chunk found in file: '%s'", filename);
if (!scriptData->data)
if (!_scriptData->data)
error("No DATA chunk found in file: '%s'", filename);
if (stream->err())
@ -127,10 +129,10 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
delete stream;
scriptData->sysFuncs = opcodes;
_scriptData->sysFuncs = opcodes;
strncpy(scriptData->filename, filename, 13);
scriptData->filename[12] = 0;
strncpy(_scriptData->filename, filename, 13);
_scriptData->filename[12] = 0;
return true;
}

1
engines/kyra/script_tim.cpp
View file

@ -140,6 +140,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) {
warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk._type), chunk._size, _filename);
}
return false;
}
TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes) {