diff options
| author | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
| commit | 7ea78b10364d34ae607a9a1da00e4d42ad691aa1 (patch) | |
| tree | c16c3d224b2ad1179dbf3e7c54b5c0212b0581a4 /engines/tinsel | |
| parent | 7e9d54a69a3444f5335b8cf6ecabdeffe2830644 (diff) | |
| parent | ea2e2053f25c216342c74bb7a74dabc682766720 (diff) | |
| download | scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.gz scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.bz2 scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.zip | |
Merged from trunk.
svn-id: r49499
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/handle.cpp | 3 | ||||
| -rw-r--r-- | engines/tinsel/saveload.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index de573feee2..60eb08a2dd 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -288,7 +288,8 @@ void LoadFile(MEMHANDLE *pH) { } // extract and zero terminate the filename - Common::strlcpy(szFilename, pH->szName, sizeof(pH->szName)); + memcpy(szFilename, pH->szName, sizeof(pH->szName)); + szFilename[sizeof(pH->szName)] = 0; if (f.open(szFilename)) { // read the data diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index b90ace4613..b010ad1fcb 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -180,7 +180,8 @@ static void syncSavedMover(Common::Serializer &s, SAVED_MOVER &sm) { static void syncSavedActor(Common::Serializer &s, SAVED_ACTOR &sa) { s.syncAsUint16LE(sa.actorID); s.syncAsUint16LE(sa.zFactor); - s.syncAsUint32LE(sa.bAlive); + s.syncAsUint16LE(sa.bAlive); + s.syncAsUint16LE(sa.bHidden); s.syncAsUint32LE(sa.presFilm); s.syncAsUint16LE(sa.presRnum); s.syncAsUint16LE(sa.presPlayX); |