[Scummvm-git-logs] scummvm branch-2-7 -> 640fe6bdd8a9b896f26a2c80bd91d3043acbc3de

mgerhardy noreply at scummvm.org
Sat Mar 4 16:13:26 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
640fe6bdd8 TWINE: fixed crash for lba1 demo


Commit: 640fe6bdd8a9b896f26a2c80bd91d3043acbc3de
    https://github.com/scummvm/scummvm/commit/640fe6bdd8a9b896f26a2c80bd91d3043acbc3de
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-03-04T17:13:11+01:00

Commit Message:
TWINE: fixed crash for lba1 demo

see https://bugs.scummvm.org/ticket/14294

introduced in 5059a77b431f8c9857dbbf8e9126ca0b06ed9720

Changed paths:
    engines/twine/parser/body.cpp


diff --git a/engines/twine/parser/body.cpp b/engines/twine/parser/body.cpp
index 9417cb2dbe7..86051d685e1 100644
--- a/engines/twine/parser/body.cpp
+++ b/engines/twine/parser/body.cpp
@@ -186,8 +186,10 @@ bool BodyData::loadFromStream(Common::SeekableReadStream &stream, bool lba1) {
 		bbox.mins.z = stream.readSint16LE();
 		bbox.maxs.z = stream.readSint16LE();
 
-		const uint16 offset = stream.readUint16LE();
-		stream.skip(offset);
+		// using this value as the offset crashes the demo of lba1 - see https://bugs.scummvm.org/ticket/14294
+		// const uint16 offset = stream.readUint16LE();
+		// stream.skip(offset);
+		stream.seek(0x1A);
 
 		loadVertices(stream);
 		loadBones(stream);




More information about the Scummvm-git-logs mailing list