[Scummvm-git-logs] scummvm master -> 8d9c9a9078657064763dbb81974858a637d6d506

dreammaster dreammaster at scummvm.org
Sat Jul 15 23:29:49 CEST 2017

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

8d9c9a9078 TITANIC: Don't allow the same star to be locked on multiple times

Commit: 8d9c9a9078657064763dbb81974858a637d6d506
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-15T17:29:42-04:00

Commit Message:
TITANIC: Don't allow the same star to be locked on multiple times

Changed paths:

diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index 722b448..75a080a 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -193,6 +193,10 @@ void CStarField::fn4(CSurfaceArea *surfaceArea, CStarCamera *camera) {
 double CStarField::fn5(CSurfaceArea *surfaceArea, CStarCamera *camera,
 		FVector &v1, FVector &v2, FVector &v3) {
 	if (_crosshairs.isEmpty())
+		// No crosshairs selection yet
+		return -1.0;
+	if (_crosshairs._entryIndex == _crosshairs._matchIndex)
+		// Trying to re-lock on a previously locked star
 		return -1.0;
 	const CBaseStarEntry *dataP = _markers.getDataPtr(_crosshairs._entryIndex);

More information about the Scummvm-git-logs mailing list