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

[sev-]

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:
f1a844783a QDENGINE: Implement moving objects differences for earlier dates


Commit: f1a844783a2f6f4d876e25b82b6c13ce990985a7
    https://github.com/scummvm/scummvm/commit/f1a844783a2f6f4d876e25b82b6c13ce990985a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-01T01:01:51+01:00

Commit Message:
QDENGINE: Implement moving objects differences for earlier dates

Partially fixes 'pass the town square' minigame in karliknos.

The exact cut-off version is not known

Changed paths:
    engines/qdengine/qdcore/qd_game_object_moving.cpp


diff --git a/engines/qdengine/qdcore/qd_game_object_moving.cpp b/engines/qdengine/qdcore/qd_game_object_moving.cpp
index 5070013af37..964c8ac11c8 100644
--- a/engines/qdengine/qdcore/qd_game_object_moving.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_moving.cpp
@@ -759,14 +759,17 @@ Vect3f qdGameObjectMoving::get_future_r(float dt, bool &end_movement, bool real_
 				dr.normalize(dist);
 				r = R() + dr;
 			}
-		} else if (_impulse_timer > FLT_EPS || has_control_type(CONTROL_AUTO_MOVE)) {
+		} else if (_impulse_timer > FLT_EPS || g_engine->_gameVersion < 20050223 || has_control_type(CONTROL_AUTO_MOVE)) {
 			float time = dt;
-			if (!has_control_type(CONTROL_AUTO_MOVE)) {
+			if ((g_engine->_gameVersion < 20050223 && _impulse_timer > FLT_EPS) ||
+				(g_engine->_gameVersion > 20050223 && !has_control_type(CONTROL_AUTO_MOVE)) ){
 				if (_impulse_timer < dt) {
 					time = _impulse_timer;
 					if (real_moving)
 						_impulse_timer = 0.0f;
-					end_movement = true;
+
+					if (g_engine->_gameVersion > 20050223 || !has_control_type(CONTROL_AUTO_MOVE))
+						end_movement = true;
 				} else if (real_moving)
 					_impulse_timer -= dt;
 			}