From 520ba69b24148b80c1a91caef32da96b57b3e931 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 31 May 2017 19:00:17 -0400
Subject: TITANIC: Renamings for locking/unlocking markers

---
 engines/titanic/core/game_object.h            |  2 +-
 engines/titanic/game/nav_helmet.cpp           |  4 ++--
 engines/titanic/star_control/star_control.cpp |  8 ++++----
 engines/titanic/star_control/star_view.cpp    |  7 +++++--
 engines/titanic/star_control/star_view.h      | 11 +++++++++--
 5 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 0cd5808741..08f53f3a83 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -45,7 +45,7 @@ enum RoomFlagsComparison { RFC_LOCATION = 1, RFC_CLASS_ELEVATOR = 2, RFC_TITANIA
 enum StarControlAction {
 	STAR_SHOW = 0, STAR_HIDE, STAR_2, STAR_RESET_POS, STAR_4, STAR_5, STAR_6, STAR_FULL_SPEED,
 	STAR_8, STAR_TOGGLE_MODE, STAR_10, STAR_11, STAR_12, STAR_13, STAR_SET_REFERENCE, STAR_FADE_IN,
-	STAR_FADE_OUT, STAR_17, STAR_18, STAR_19
+	STAR_FADE_OUT, LOCK_STAR, UNLOCK_STAR, STAR_19
 };
 
 class CDontSaveFileItem;
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 37d96a21fd..8002eebcb5 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -115,10 +115,10 @@ bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
 	if (_flag) {
 		if (msg->_value) {
 			playSound("a#6.wav");
-			starFn(STAR_17);
+			starFn(LOCK_STAR);
 		} else {
 			playSound("a#5.wav");
-			starFn(STAR_18);
+			starFn(UNLOCK_STAR);
 		}
 	}
 
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index b58a5408c7..d9737bc2f6 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -242,12 +242,12 @@ void CStarControl::doAction(StarControlAction action) {
 		_view.fn3(false);
 		break;
 
-	case STAR_17:
-		_view.fn16();
+	case LOCK_STAR:
+		_view.lockStar();
 		break;
 
-	case STAR_18:
-		_view.fn17();
+	case UNLOCK_STAR:
+		_view.unlockStar();
 		break;
 
 	case STAR_19:
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index d93e7aa22b..12945b9b5a 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -375,7 +375,7 @@ void CStarView::setHasReference() {
 	_field218 = true;
 }
 
-void CStarView::fn16() {
+void CStarView::lockStar() {
 	if (_starField && !_showingPhoto) {
 		CSurfaceArea surfaceArea(_videoSurface);
 		FVector v1, v2, v3;
@@ -387,16 +387,19 @@ void CStarView::fn16() {
 
 			switch (_starField->getMatchedIndex()) {
 			case -1:
+				// First star match
 				_camera.fn2(v1, v2, v3);
 				_starField->fn7();
 				break;
 
 			case 0:
+				// Second star match
 				_camera.fn3(&_photoViewport, v2);
 				_starField->fn7();
 				break;
 
 			case 1:
+				// Third star match
 				_camera.fn1(&_photoViewport, v2);
 				_starField->fn7();
 				break;
@@ -408,7 +411,7 @@ void CStarView::fn16() {
 	}
 }
 
-void CStarView::fn17() {
+void CStarView::unlockStar() {
 	if (_starField && !_showingPhoto) {
 		_camera.removeMatrixRow();
 		_starField->fn8(_photoSurface);
diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h
index ce082a45a3..a98886eb51 100644
--- a/engines/titanic/star_control/star_view.h
+++ b/engines/titanic/star_control/star_view.h
@@ -158,8 +158,15 @@ public:
 	 */
 	void setHasReference();
 	
-	void fn16();
-	void fn17();
+	/**
+	  * Handles locking in a star
+	  */
+	void lockStar();
+
+	/**
+	 * Handles unlocking a star
+	 */
+	void unlockStar();
 
 };
 
-- 
cgit v1.2.3