[Scummvm-git-logs] scummvm master -> 13048f2af005a717d324ad0375cca5081cd416ba

dreammaster dreammaster at scummvm.org
Tue Jun 6 02:28:11 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:
13048f2af0 TITANIC: Add some const prefixes to mover proc2


Commit: 13048f2af005a717d324ad0375cca5081cd416ba
    https://github.com/scummvm/scummvm/commit/13048f2af005a717d324ad0375cca5081cd416ba
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-05T20:27:59-04:00

Commit Message:
TITANIC: Add some const prefixes to mover proc2

Changed paths:
    engines/titanic/star_control/star_control_sub23.cpp
    engines/titanic/star_control/star_control_sub23.h
    engines/titanic/star_control/star_control_sub27.cpp
    engines/titanic/star_control/star_control_sub27.h


diff --git a/engines/titanic/star_control/star_control_sub23.cpp b/engines/titanic/star_control/star_control_sub23.cpp
index 3f35481..f72d5c8 100644
--- a/engines/titanic/star_control/star_control_sub23.cpp
+++ b/engines/titanic/star_control/star_control_sub23.cpp
@@ -41,8 +41,8 @@ CStarControlSub23::CStarControlSub23() : _srcPos(0.0, 1000000.0, 0.0) {
 	_transitionPercentInc = 0.0;
 }
 
-void CStarControlSub23::proc2(FVector &oldPos, FVector &newPos,
-		FMatrix &oldOrientation, FMatrix &newOrientation) {
+void CStarControlSub23::proc2(const FVector &oldPos, const FVector &newPos,
+	const FMatrix &oldOrientation, const FMatrix &newOrientation) {
 	_srcPos = oldPos;
 	_destPos = newPos;
 	_posDelta = _destPos - _srcPos;
diff --git a/engines/titanic/star_control/star_control_sub23.h b/engines/titanic/star_control/star_control_sub23.h
index dec208d..af6d9de 100644
--- a/engines/titanic/star_control/star_control_sub23.h
+++ b/engines/titanic/star_control/star_control_sub23.h
@@ -53,8 +53,8 @@ public:
 	CStarControlSub23();
 	virtual ~CStarControlSub23() {}
 
-	virtual void proc2(FVector &oldPos, FVector &newPos,
-		FMatrix &oldOrientation, FMatrix &newOrientation);
+	virtual void proc2(const FVector &oldPos, const FVector &newPos,
+		const FMatrix &oldOrientation, const FMatrix &newOrientation);
 	virtual void proc3(const FMatrix &srcOrient, const FMatrix &destOrient);
 	virtual void setPath(const FVector &srcV, const FVector &destV, const FMatrix &orientation);
 	virtual int proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return 2; }
diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp
index 1664a1f..1212581 100644
--- a/engines/titanic/star_control/star_control_sub27.cpp
+++ b/engines/titanic/star_control/star_control_sub27.cpp
@@ -25,8 +25,8 @@
 
 namespace Titanic {
 
-void CStarControlSub27::proc2(FVector &oldPos, FVector &newPos,
-	FMatrix &oldOrientation, FMatrix &newOrientation) {
+void CStarControlSub27::proc2(const FVector &oldPos, const FVector &newPos,
+	const FMatrix &oldOrientation, const FMatrix &newOrientation) {
 	CStarControlSub23::proc2(oldPos, newPos, oldOrientation, newOrientation);
 
 	double distance = _distance;
diff --git a/engines/titanic/star_control/star_control_sub27.h b/engines/titanic/star_control/star_control_sub27.h
index 311cf78..c6d29b1 100644
--- a/engines/titanic/star_control/star_control_sub27.h
+++ b/engines/titanic/star_control/star_control_sub27.h
@@ -38,8 +38,8 @@ private:
 public:
 	virtual ~CStarControlSub27() {}
 
-	virtual void proc2(FVector &oldPos, FVector &newPos,
-		FMatrix &oldOrientation, FMatrix &newOrientation);
+	virtual void proc2(const FVector &oldPos, const FVector &newPos,
+		const FMatrix &oldOrientation, const FMatrix &newOrientation);
 	virtual int proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orientation);
 };
 





More information about the Scummvm-git-logs mailing list