[Scummvm-git-logs] scummvm master -> f98abd462ac5e2497c8e6783039e4c4e6fccf4e3
dreammaster
dreammaster at scummvm.org
Sun Apr 2 00:45:31 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:
f98abd462a TITANIC: Fix CStarControlSub13 _valArray setup
Commit: f98abd462ac5e2497c8e6783039e4c4e6fccf4e3
https://github.com/scummvm/scummvm/commit/f98abd462ac5e2497c8e6783039e4c4e6fccf4e3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-01T18:45:22-04:00
Commit Message:
TITANIC: Fix CStarControlSub13 _valArray setup
Changed paths:
engines/titanic/star_control/star_control_sub13.cpp
engines/titanic/star_control/star_control_sub13.h
diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index dd4fcde..6475c75 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -160,17 +160,17 @@ void CStarControlSub13::fn12() {
_flag = false;
}
-void CStarControlSub13::fn13(StarMode mode, double v2) {
- if (mode == MODE_STARFIELD) {
- _valArray[0] = v2;
- _valArray[1] = -v2;
+void CStarControlSub13::fn13(StarMode mode, double val) {
+ if (mode == MODE_PHOTO) {
+ _valArray[0] = val;
+ _valArray[1] = -val;
} else {
- _valArray[3] = v2;
- _valArray[4] = -v2;
+ _valArray[3] = val;
+ _valArray[4] = -val;
}
_valArray[2] = 0.0;
- _field24 = v2 ? 2 : 0;
+ _field24 = val ? 2 : 0;
}
void CStarControlSub13::reposition(double factor) {
diff --git a/engines/titanic/star_control/star_control_sub13.h b/engines/titanic/star_control/star_control_sub13.h
index 3c8606d..e47c42e 100644
--- a/engines/titanic/star_control/star_control_sub13.h
+++ b/engines/titanic/star_control/star_control_sub13.h
@@ -87,7 +87,7 @@ public:
void fn11(const FVector &v);
void fn12();
- void fn13(StarMode mode, double v2);
+ void fn13(StarMode mode, double val);
void reposition(double factor);
void fn15(const FMatrix &matrix);
CStarControlSub6 getSub1();
More information about the Scummvm-git-logs
mailing list