[Scummvm-git-logs] scummvm master -> aa64aceedba41e4c7aed6f65d261d8bbae81e65e

[mgerhardy]

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

Summary:
aa64aceedb TWINE: fixed slow holomap rotation


Commit: aa64aceedba41e4c7aed6f65d261d8bbae81e65e
    https://github.com/scummvm/scummvm/commit/aa64aceedba41e4c7aed6f65d261d8bbae81e65e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2026-05-25T07:54:35+02:00

Commit Message:
TWINE: fixed slow holomap rotation

https://bugs.scummvm.org/ticket/15409 - the angles were not properly clamped and the holomap loop wasn't running at 50hz as the original did

Changed paths:
    engines/twine/holomap_v1.cpp


diff --git a/engines/twine/holomap_v1.cpp b/engines/twine/holomap_v1.cpp
index 5db2557060c..b4e2aeefdea 100644
--- a/engines/twine/holomap_v1.cpp
+++ b/engines/twine/holomap_v1.cpp
@@ -382,7 +382,7 @@ void HolomapV1::holoTraj(int32 trajectoryIndex) {
 	bool flagpal = true;
 	_engine->_input->enableKeyMap(holomapKeyMapId);
 	for (;;) {
-		FrameMarker frame(_engine);
+		FrameMarker frame(_engine, 50);
 		_engine->readKeys();
 		if (_engine->shouldQuit() || _engine->_input->toggleAbortAction()) {
 			break;
@@ -586,7 +586,7 @@ void HolomapV1::holoMap() {
 	_engine->_input->enableKeyMap(holomapKeyMapId);
 
 	for (;;) {
-		FrameMarker frame(_engine);
+		FrameMarker frame(_engine, 50);
 		_engine->_input->readKeys();
 		if (_engine->shouldQuit() || _engine->_input->toggleAbortAction()) {
 			break;
@@ -601,8 +601,8 @@ void HolomapV1::holoMap() {
 			_oalpha = _calpha;
 			_obeta = _cbeta;
 			_otimer = _engine->timerRef;
-			_dalpha = _listHoloPos[_current].alpha;
-			_dbeta = _listHoloPos[_current].beta;
+			_dalpha = ClampAngle(_listHoloPos[_current].alpha);
+			_dbeta = ClampAngle(_listHoloPos[_current].beta);
 			_automove = true;
 			_flagredraw = true;
 			debugC(1, TwinE::kDebugHolomap, "Holomap prev: %i (target angles: alpha %d, beta: %d)", _current, _dalpha, _dbeta);
@@ -615,8 +615,8 @@ void HolomapV1::holoMap() {
 			_oalpha = _calpha;
 			_obeta = _cbeta;
 			_otimer = _engine->timerRef;
-			_dalpha = _listHoloPos[_current].alpha;
-			_dbeta = _listHoloPos[_current].beta;
+			_dalpha = ClampAngle(_listHoloPos[_current].alpha);
+			_dbeta = ClampAngle(_listHoloPos[_current].beta);
 			_automove = true;
 			_flagredraw = true;
 			debugC(1, TwinE::kDebugHolomap, "Holomap next: %i (target angles: alpha %d, beta: %d)", _current, _dalpha, _dbeta);