[Scummvm-git-logs] scummvm branch-2-5 -> 9228d49b22580b59cd1312118d7ba41470c36cd1

mgerhardy martin.gerhardy at gmail.com
Sat Oct 9 08:58:35 UTC 2021


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:
9228d49b22 TWINE: fixed missing holomap surface mappings


Commit: 9228d49b22580b59cd1312118d7ba41470c36cd1
    https://github.com/scummvm/scummvm/commit/9228d49b22580b59cd1312118d7ba41470c36cd1
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-10-09T10:58:24+02:00

Commit Message:
TWINE: fixed missing holomap surface mappings

Changed paths:
    engines/twine/holomap.cpp


diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index c55346d78c..f63728c605 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -151,7 +151,8 @@ void Holomap::prepareHolomapSurface() {
 	int holomapSurfaceArrayIdx = 0;
 	_engine->_renderer->setBaseRotation(0, 0, 0);
 	for (int alpha = -ANGLE_90; alpha <= ANGLE_90; alpha += ANGLE_11_25) {
-		const int64 pos = stream.pos();
+		const int32 rot = stream.readByte();
+		stream.seek(-1, SEEK_CUR);
 		for (int beta = 0; beta < ANGLE_360; beta += ANGLE_11_25) {
 			const int32 rotX = stream.readByte();
 			const IVec3 &rotVec = _engine->_renderer->getHolomapRotation(rotX, alpha, beta);
@@ -160,9 +161,7 @@ void Holomap::prepareHolomapSurface() {
 			_holomapSurface[holomapSurfaceArrayIdx].z = rotVec.z;
 			++holomapSurfaceArrayIdx;
 		}
-		stream.seek(pos);
-		const int32 rotX = stream.readByte();
-		const IVec3 &rotVec = _engine->_renderer->getHolomapRotation(rotX, alpha, 0);
+		const IVec3 &rotVec = _engine->_renderer->getHolomapRotation(rot, alpha, 0);
 		_holomapSurface[holomapSurfaceArrayIdx].x = rotVec.x;
 		_holomapSurface[holomapSurfaceArrayIdx].y = rotVec.y;
 		_holomapSurface[holomapSurfaceArrayIdx].z = rotVec.z;




More information about the Scummvm-git-logs mailing list