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

[dreammaster]

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

Summary:
c4751fc611 TITANIC: Change Starview slowdown to reverse
b818656a85 Merge pull request #983 from dafioram/titanic_starview_addReverse


Commit: c4751fc6110154951df0f14b9dbfd9ca40d0db6c
    https://github.com/scummvm/scummvm/commit/c4751fc6110154951df0f14b9dbfd9ca40d0db6c
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-08-06T18:05:18-07:00

Commit Message:
TITANIC: Change Starview slowdown to reverse

This changes the starview manual camera movement using semicolon.
Before it slowed down the ship. To make it more like the original
game it now adds negative velocity so that it slows down then
speeds up in the backward direction.

The functions were renamed accordingly.

Changed paths:
    engines/titanic/star_control/camera_mover.cpp
    engines/titanic/star_control/camera_mover.h
    engines/titanic/star_control/star_camera.cpp
    engines/titanic/star_control/star_camera.h
    engines/titanic/star_control/star_view.cpp


diff --git a/engines/titanic/star_control/camera_mover.cpp b/engines/titanic/star_control/camera_mover.cpp
index 8b1e4ef..f6392d5 100644
--- a/engines/titanic/star_control/camera_mover.cpp
+++ b/engines/titanic/star_control/camera_mover.cpp
@@ -69,20 +69,17 @@ void CCameraMover::copyTo(CNavigationInfo *dest) {
 	dest->_unusedZ = _unusedZ;
 }
 
-void CCameraMover::increaseSpeed() {
+void CCameraMover::increaseForwardSpeed() {
 	if (!isLocked() && _speed < _maxSpeed) {
 		_speedChangeCtr += _speedChangeInc;
 		_speed += ABS(_speedChangeCtr);
 	}
 }
 
-void CCameraMover::decreaseSpeed() {
-	if (!isLocked()) {
+void CCameraMover::increaseBackwardSpeed() {
+	if (!isLocked() && _speed > -_maxSpeed) {
 		_speedChangeCtr -= _speedChangeInc;
 		_speed -= ABS(_speedChangeCtr);
-
-		if (_speedChangeCtr < 0.0)
-			_speedChangeCtr = 0.0;
 	}
 }
 
diff --git a/engines/titanic/star_control/camera_mover.h b/engines/titanic/star_control/camera_mover.h
index ef5f355..c3ec0c6 100644
--- a/engines/titanic/star_control/camera_mover.h
+++ b/engines/titanic/star_control/camera_mover.h
@@ -53,14 +53,14 @@ public:
 	virtual void copyTo(CNavigationInfo *dest);
 
 	/**
-	 * Increases movement speed
+	 * Increases movement speed in forward direction
 	 */
-	virtual void increaseSpeed();
+	virtual void increaseForwardSpeed();
 
 	/**
-	 * Decreases movement speed
+	 * Decreases movement speed in backward direction
 	 */
-	virtual void decreaseSpeed();
+	virtual void increaseBackwardSpeed();
 
 	/**
 	 * Increase to full speed
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 0d81383..6829194 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -146,12 +146,12 @@ void CStarCamera::updatePosition(CErrorCode *errorCode) {
 	}
 }
 
-void CStarCamera::increaseSpeed() {
-	_mover->increaseSpeed();
+void CStarCamera::increaseForwardSpeed() {
+	_mover->increaseForwardSpeed();
 }
 
-void CStarCamera::decreaseSpeed() {
-	_mover->decreaseSpeed();
+void CStarCamera::increaseBackwardSpeed() {
+	_mover->increaseBackwardSpeed();
 }
 
 void CStarCamera::fullSpeed() {
diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h
index 1f0e12c..fa46eb3 100644
--- a/engines/titanic/star_control/star_camera.h
+++ b/engines/titanic/star_control/star_camera.h
@@ -102,14 +102,14 @@ public:
 	virtual void updatePosition(CErrorCode *errorCode);
 
 	/**
-	 * Increases movement speed
+	 * Increases movement speed in forward direction
 	 */
-	virtual void increaseSpeed();
+	virtual void increaseForwardSpeed();
 
 	/**
-	 * Decreases movement speed
+	 * Decreases movement speed in backward direction
 	 */
-	virtual void decreaseSpeed();
+	virtual void increaseBackwardSpeed();
 
 	/**
 	 * Increase to full speed
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 97752c2..576fd87 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -187,7 +187,7 @@ bool CStarView::KeyCharMsg(int key, CErrorCode *errorCode) {
 
 	case Common::KEYCODE_SEMICOLON:
 		if (matchedIndex == -1) {
-			_camera.increaseSpeed();
+			_camera.increaseForwardSpeed();
 			errorCode->set();
 			return true;
 		}
@@ -195,7 +195,7 @@ bool CStarView::KeyCharMsg(int key, CErrorCode *errorCode) {
 
 	case Common::KEYCODE_PERIOD:
 		if (matchedIndex == -1) {
-			_camera.decreaseSpeed();
+			_camera.increaseBackwardSpeed();
 			errorCode->set();
 			return true;
 		}


Commit: b818656a851b2f2b08ddf0004d1ce8ef760ce184
    https://github.com/scummvm/scummvm/commit/b818656a851b2f2b08ddf0004d1ce8ef760ce184
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T21:23:54-04:00

Commit Message:
Merge pull request #983 from dafioram/titanic_starview_addReverse

TITANIC: Change Starview slowdown to reverse

Changed paths:
    engines/titanic/star_control/camera_mover.cpp
    engines/titanic/star_control/camera_mover.h
    engines/titanic/star_control/star_camera.cpp
    engines/titanic/star_control/star_camera.h
    engines/titanic/star_control/star_view.cpp