diff options
author | Filippos Karapetis | 2017-03-22 03:10:32 +0200 |
---|---|---|
committer | Filippos Karapetis | 2017-03-22 03:10:32 +0200 |
commit | 93e93b56405cc395e723cd43e7ed0008173eab18 (patch) | |
tree | 3d90edb167276dfdb971626b666d7e0c5ff45a0d /engines/fullpipe/statics.cpp | |
parent | a2b4d637dbd70f084e1bda94d67f5b197a5d2a21 (diff) | |
download | scummvm-rg350-93e93b56405cc395e723cd43e7ed0008173eab18.tar.gz scummvm-rg350-93e93b56405cc395e723cd43e7ed0008173eab18.tar.bz2 scummvm-rg350-93e93b56405cc395e723cd43e7ed0008173eab18.zip |
FULLPIPE: Use Common::String with _memfilename and loadFile()
There are several calls to loadFile() with _memfilename, which is why
these two changes are interconnected
Diffstat (limited to 'engines/fullpipe/statics.cpp')
-rw-r--r-- | engines/fullpipe/statics.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index e87cf02a42..25aef988b5 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -1446,8 +1446,7 @@ Statics::Statics(Statics *src, bool reverse) : DynamicPhase(src, reverse) { _staticsName = src->_staticsName; } - _memfilename = (char *)calloc(strlen(src->_memfilename) + 1, 1); - strncpy(_memfilename, src->_memfilename, strlen(src->_memfilename) + 1); + _memfilename = src->_memfilename; _picture = new Picture(); } @@ -2236,8 +2235,7 @@ DynamicPhase::DynamicPhase(DynamicPhase *src, bool reverse) { _mfield_8 = src->_mfield_8; _mflags = src->_mflags; - _memfilename = (char *)calloc(strlen(src->_memfilename) + 1, 1); - strncpy(_memfilename, src->_memfilename, strlen(src->_memfilename) + 1); + _memfilename = src->_memfilename; _dataSize = src->_dataSize; _mfield_10 = src->_mfield_10; _libHandle = src->_libHandle; |