aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2009-06-12 10:26:15 +0000
committerNicola Mettifogo2009-06-12 10:26:15 +0000
commit20d75f6ec75b112a1aae4353b9ada019e1f437f3 (patch)
treec1b252bc58c5ddc997d1de27c07caf5197af4a65 /engines/kyra/script.cpp
parent5172c83200c7fab38a5264000cea3c72cd33cb15 (diff)
downloadscummvm-rg350-20d75f6ec75b112a1aae4353b9ada019e1f437f3.tar.gz
scummvm-rg350-20d75f6ec75b112a1aae4353b9ada019e1f437f3.tar.bz2
scummvm-rg350-20d75f6ec75b112a1aae4353b9ada019e1f437f3.zip
Added missing return statements.
svn-id: r41473
Diffstat (limited to 'engines/kyra/script.cpp')
-rw-r--r--engines/kyra/script.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 0a60c9d154..0473f03591 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -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;
}