libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: 3DO: adjust object cAnim loading

Browse Source 
data layout is also not the same as on PC
This commit is contained in:
Martin Kiewitz 2015-06-13 00:37:32 +02:00
parent 46a49849cc
commit 210b9f92e1
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engines/sherlock/objects.cpp
View File

@ -1551,30 +1551,37 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
}
void CAnim::load3DO(Common::SeekableReadStream &s) {
// this got reordered on 3DO
// maybe it was the 3DO compiler
_size = s.readUint32BE();
_position.x = s.readSint16BE();
_position.y = s.readSint16BE();
_type = (SpriteType)s.readUint16BE();
_goto.x = s.readSint16BE();
_goto.y = s.readSint16BE();
_gotoDir = s.readSint16BE();
_teleportPos.x = s.readSint16BE();
_teleportPos.y = s.readSint16BE();
_teleportDir = s.readSint16BE();
char buffer[12];
s.read(buffer, 12);
_name = Common::String(buffer);
s.read(_sequences, 30);
_position.x = s.readSint16BE();
_position.y = s.readSint16BE();
_size = s.readUint32BE();
_type = (SpriteType)s.readUint16BE();
_flags = s.readByte();
_goto.x = s.readSint16BE();
_goto.y = s.readSint16BE();
_gotoDir = s.readSint16BE();
_teleportPos.x = s.readSint16BE();
_teleportPos.y = s.readSint16BE();
s.skip(3); // Filler
_goto.x = _goto.x * FIXED_INT_MULTIPLIER / 100;
_goto.y = _goto.y * FIXED_INT_MULTIPLIER / 100;
_teleportPos.x = _teleportPos.x * FIXED_INT_MULTIPLIER / 100;
_teleportPos.y = _teleportPos.y * FIXED_INT_MULTIPLIER / 100;
_teleportDir = s.readSint16BE();
}
/*----------------------------------------------------------------*/

4
engines/sherlock/scene.cpp
View File

@ -686,10 +686,8 @@ bool Scene::loadScene(const Common::String &filename) {
// === CANIM === read cAnim list
_cAnim.clear();
if (header3DO_numAnimations) {
int animSize = 65;
roomStream->seek(header3DO_cAnim_offset);
Common::SeekableReadStream *canimStream = roomStream->readStream(animSize * header3DO_numAnimations);
Common::SeekableReadStream *canimStream = roomStream->readStream(header3DO_cAnim_size);
_cAnim.resize(header3DO_numAnimations);
for (uint idx = 0; idx < _cAnim.size(); ++idx)