aboutsummaryrefslogtreecommitdiff
path: root/engines/toon/script.cpp
diff options
context:
space:
mode:
authorKamil Zbróg2013-11-02 15:29:36 +0000
committerKamil Zbróg2013-11-02 15:29:36 +0000
commit5d8e664b003b4d06f52500e530e0f566b3dc7139 (patch)
tree19bb88dea32b3dbc7f191d966920d332b228fc45 /engines/toon/script.cpp
parente72742d0e3c040869e57c559cbc6ed8504dd5d09 (diff)
parent7e1f280a9b56e48ea2e64a54018794c71bdefc51 (diff)
downloadscummvm-rg350-5d8e664b003b4d06f52500e530e0f566b3dc7139.tar.gz
scummvm-rg350-5d8e664b003b4d06f52500e530e0f566b3dc7139.tar.bz2
scummvm-rg350-5d8e664b003b4d06f52500e530e0f566b3dc7139.zip
Merge remote-tracking branch 'origin/master' into prince
Diffstat (limited to 'engines/toon/script.cpp')
-rw-r--r--engines/toon/script.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp
index 69ae727bb5..d752c277db 100644
--- a/engines/toon/script.cpp
+++ b/engines/toon/script.cpp
@@ -59,6 +59,8 @@ EMCInterpreter::EMCInterpreter(ToonEngine *vm) : _vm(vm), _scriptData(0), _filen
};
_opcodes = opcodes;
#undef OPCODE
+
+ _parameter = 0;
}
EMCInterpreter::~EMCInterpreter() {
@@ -132,8 +134,7 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
_scriptData->sysFuncs = opcodes;
- strncpy(_scriptData->filename, filename, 13);
- _scriptData->filename[12] = 0;
+ Common::strlcpy(_scriptData->filename, filename, 13);
_scriptData = 0;
_filename = 0;