aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Fioramonti2017-09-07 04:29:21 -0700
committerDavid Fioramonti2017-09-07 06:23:01 -0700
commit40684e83d33eea7bfc91efb1e89d77d7e6ce8f14 (patch)
tree323517881de1db107f4883a7f145efc6a75afe1b
parent902b191266b470ef4bc4b753cd1a605f899d951a (diff)
downloadscummvm-rg350-40684e83d33eea7bfc91efb1e89d77d7e6ce8f14.tar.gz
scummvm-rg350-40684e83d33eea7bfc91efb1e89d77d7e6ce8f14.tar.bz2
scummvm-rg350-40684e83d33eea7bfc91efb1e89d77d7e6ce8f14.zip
TITANIC: Better naming for Viewport function
I differentiated getRelativePosCentering() and getRelativePosCentering2() since one was using the raw Pose and one was using the regular Pose.
-rw-r--r--engines/titanic/star_control/star_camera.cpp2
-rw-r--r--engines/titanic/star_control/viewport.cpp2
-rw-r--r--engines/titanic/star_control/viewport.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index cab29a99f4..4edc05bbf7 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -246,7 +246,7 @@ FVector CStarCamera::proc30(int index, const FVector &v) {
}
FVector CStarCamera::proc31(int index, const FVector &v) {
- return _viewport.getRelativePosCentering2(index, v);
+ return _viewport.getRelativePosCenteringRaw(index, v);
}
void CStarCamera::setViewportAngle(const FPoint &angles) {
diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp
index d277f4a2c5..07a6dcc36c 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -261,7 +261,7 @@ FVector CViewport::getRelativePosCentering(int index, const FVector &src) {
}
// TODO: Identical to getRelativePosCentering, was this meant to be different?
-FVector CViewport::getRelativePosCentering2(int index, const FVector &src) {
+FVector CViewport::getRelativePosCenteringRaw(int index, const FVector &src) {
FVector dest;
FPose pose = getRawPose();
FVector tv = src.matProdRowVect(pose);
diff --git a/engines/titanic/star_control/viewport.h b/engines/titanic/star_control/viewport.h
index d5c35b6317..082d063233 100644
--- a/engines/titanic/star_control/viewport.h
+++ b/engines/titanic/star_control/viewport.h
@@ -125,7 +125,7 @@ public:
FPose getRawPose();
FVector getRelativePosNoCentering(int index, const FVector &src);
FVector getRelativePosCentering(int index, const FVector &src);
- FVector getRelativePosCentering2(int index, const FVector &src);
+ FVector getRelativePosCenteringRaw(int index, const FVector &src);
/**
* All arguments are return values