[Scummvm-cvs-logs] SF.net SVN: scummvm:[41473] scummvm/trunk/engines/kyra
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Jun 12 12:26:15 CEST 2009
Revision: 41473
http://scummvm.svn.sourceforge.net/scummvm/?rev=41473&view=rev
Author: peres001
Date: 2009-06-12 10:26:15 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
Added missing return statements.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp 2009-06-12 10:25:05 UTC (rev 41472)
+++ scummvm/trunk/engines/kyra/script.cpp 2009-06-12 10:26:15 UTC (rev 41473)
@@ -98,6 +98,8 @@
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 @@
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 @@
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;
}
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2009-06-12 10:25:05 UTC (rev 41472)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2009-06-12 10:26:15 UTC (rev 41473)
@@ -140,6 +140,7 @@
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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list