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

dreammaster dreammaster at scummvm.org
Sun Apr 16 03:25:06 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 .

Summary:
d128587e99 TITANIC: Movement starting to work when star is clicked


Commit: d128587e99d93e55cf9de9da771f1f775d27ad18
    https://github.com/scummvm/scummvm/commit/d128587e99d93e55cf9de9da771f1f775d27ad18
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-15T21:24:56-04:00

Commit Message:
TITANIC: Movement starting to work when star is clicked

Changed paths:
    engines/titanic/star_control/star_control_sub24.cpp
    engines/titanic/star_control/star_control_sub27.cpp


diff --git a/engines/titanic/star_control/star_control_sub24.cpp b/engines/titanic/star_control/star_control_sub24.cpp
index 2c7a663..dc6e79c 100644
--- a/engines/titanic/star_control/star_control_sub24.cpp
+++ b/engines/titanic/star_control/star_control_sub24.cpp
@@ -87,7 +87,8 @@ int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &v, FMatrix &m) {
 		return 0;
 
 	if (_field58 < 1.0) {
-		_sub25.fn2(_field60 + _field58, m);
+		_field58 += _field60;
+		_sub25.fn2(_field58, m);
 		errorCode.set();
 		return 1;
 	}
diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp
index 1edf9e1..783f6a3 100644
--- a/engines/titanic/star_control/star_control_sub27.cpp
+++ b/engines/titanic/star_control/star_control_sub27.cpp
@@ -54,7 +54,6 @@ int CStarControlSub27::proc5(CErrorCode &errorCode, FVector &v, FMatrix &m) {
 		return 0;
 
 	_field58 += _field60;
-	_field58 = _field58;
 	_sub25.fn2(_field58, m);
 	errorCode.set();
 





More information about the Scummvm-git-logs mailing list