[Scummvm-git-logs] scummvm master -> 8f54c55e903f5e5306e45f153241e9260fb8fe49

dreammaster dreammaster at scummvm.org
Sat Apr 1 23:36:20 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:
8f54c55e90 TITANIC: Fix CStarControlSub13 loading/saving width & height


Commit: 8f54c55e903f5e5306e45f153241e9260fb8fe49
    https://github.com/scummvm/scummvm/commit/8f54c55e903f5e5306e45f153241e9260fb8fe49
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-01T17:36:10-04:00

Commit Message:
TITANIC: Fix CStarControlSub13 loading/saving width & height

Changed paths:
    engines/titanic/star_control/star_control_sub13.cpp


diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index 1e9cffb..e6e46d9 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -77,8 +77,8 @@ void CStarControlSub13::load(SimpleFile *file, int param) {
 	_field1C = file->readFloat();
 
 	int widthHeight = file->readNumber();
-	_width = widthHeight & 0xff;
-	_height = _width >> 16;
+	_width = widthHeight & 0xffff;
+	_height = widthHeight >> 16;
 	_field24 = file->readNumber();
 
 	for (int idx = 0; idx < 5; ++idx)
@@ -97,7 +97,7 @@ void CStarControlSub13::save(SimpleFile *file, int indent) {
 	file->writeFloatLine(_field14, indent);
 	file->writeFloatLine(_field18, indent);
 	file->writeFloatLine(_field1C, indent);
-	file->writeFloatLine(_width | (_height << 16), indent);
+	file->writeNumberLine(_width | (_height << 16), indent);
 
 	for (int idx = 0; idx < 5; ++idx)
 		file->writeFloatLine(_valArray[idx], indent);
@@ -250,9 +250,7 @@ void CStarControlSub13::reset() {
 	const double FACTOR = 2 * M_PI / 360.0;
 
 	_sub2.copyFrom(_matrix);
-	_sub2._vector._x = _position._x;
-	_sub2._vector._y = _position._y;
-	_sub2._vector._z = _position._z;
+	_sub2._vector = _position;
 	_sub2.fn4(&_sub1);
 
 	double widthV = (double)_width * 0.5;





More information about the Scummvm-git-logs mailing list