[Scummvm-git-logs] scummvm master -> e107003c4c83418a34fa15813fc4f3c7de473cf7
dreammaster
dreammaster at scummvm.org
Sat Feb 25 05:30:20 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
985f8a3720 TITANIC: Fixes for coordinates init in CStarPoints1
e107003c4c TITANIC: Some preliminary cleanup of star control interfaces
Commit: 985f8a3720873b6bfd2bd2cb5bcda78b24629e84
https://github.com/scummvm/scummvm/commit/985f8a3720873b6bfd2bd2cb5bcda78b24629e84
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-24T23:29:54-05:00
Commit Message:
TITANIC: Fixes for coordinates init in CStarPoints1
Changed paths:
engines/titanic/star_control/star_points1.cpp
diff --git a/engines/titanic/star_control/star_points1.cpp b/engines/titanic/star_control/star_points1.cpp
index 6e698d6..a846238 100644
--- a/engines/titanic/star_control/star_points1.cpp
+++ b/engines/titanic/star_control/star_points1.cpp
@@ -42,16 +42,16 @@ bool CStarPoints1::initialize() {
FVector &entry = _data[idx];
// Get the next set of values
- double v1 = stream->readUint32LE();
- double v2 = stream->readUint32LE();
+ double v1 = stream->readSint32LE();
+ double v2 = stream->readSint32LE();
stream->readUint32LE();
- v1 *= 0.0099999998 * FACTOR;
- v2 *= 0.015 * FACTOR;
+ v1 *= 0.015 * FACTOR;
+ v2 *= 0.0099999998 * FACTOR;
entry._x = cos(v2) * 3000000.0 * cos(v1);
- entry._y = sin(v2) * 3000000.0 * cos(v1);
- entry._z = sin(v1) * 3000000.0;
+ entry._y = sin(v1) * 3000000.0 * cos(v2);
+ entry._z = sin(v2) * 3000000.0;
}
return true;
Commit: e107003c4c83418a34fa15813fc4f3c7de473cf7
https://github.com/scummvm/scummvm/commit/e107003c4c83418a34fa15813fc4f3c7de473cf7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-24T23:30:17-05:00
Commit Message:
TITANIC: Some preliminary cleanup of star control interfaces
Changed paths:
engines/titanic/carry/photograph.cpp
engines/titanic/core/game_object.cpp
engines/titanic/core/game_object.h
engines/titanic/game/nav_helmet.cpp
engines/titanic/star_control/base_star.cpp
engines/titanic/star_control/star_control.cpp
engines/titanic/star_control/star_control.h
diff --git a/engines/titanic/carry/photograph.cpp b/engines/titanic/carry/photograph.cpp
index 76487ca..d358377 100644
--- a/engines/titanic/carry/photograph.cpp
+++ b/engines/titanic/carry/photograph.cpp
@@ -64,7 +64,7 @@ bool CPhotograph::MouseDragEndMsg(CMouseDragEndMsg *msg) {
moveUnder(getDontSave());
makeDirty();
playSound("a#46.wav");
- starFn1(14);
+ starFn(14);
showMouse();
return true;
} else {
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 314746e..589d026 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1637,10 +1637,10 @@ CStarControl *CGameObject::getStarControl() const {
return starControl;
}
-void CGameObject::starFn1(int v) {
+void CGameObject::starFn(int action) {
CStarControl *starControl = getStarControl();
if (starControl)
- starControl->fn1(v);
+ starControl->doAction(action);
}
bool CGameObject::starIsSolved() const {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index b214cf8..2025c57 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -945,7 +945,10 @@ public:
*/
CStarControl *getStarControl() const;
- void starFn1(int v);
+ /**
+ * Executes an action in the StarControl subsystem
+ */
+ void starFn(int action);
/**
* Returns true if the starmap puzzle has been solved
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 874683a..ab86bd7 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -58,8 +58,8 @@ bool CNavHelmet::MovieEndMsg(CMovieEndMsg *msg) {
pet->incAreaLocks();
}
- starFn1(0);
- starFn1(12);
+ starFn(0);
+ starFn(12);
}
return true;
@@ -81,7 +81,7 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
if (_flag) {
_flag = false;
setVisible(true);
- starFn1(1);
+ starFn(1);
playMovie(61, 120, MOVIE_NOTIFY_OBJECT);
playSound("a#47.wav");
playSound("a#48.wav");
@@ -106,7 +106,7 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
bool CNavHelmet::PETPhotoOnOffMsg(CPETPhotoOnOffMsg *msg) {
if (_flag)
- starFn1(9);
+ starFn(9);
return true;
}
@@ -115,10 +115,10 @@ bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
if (_flag) {
if (msg->_value) {
playSound("a#6.wav");
- starFn1(17);
+ starFn(17);
} else {
playSound("a#5.wav");
- starFn1(18);
+ starFn(18);
}
}
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index f09df38..a6ef6d8 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -34,7 +34,7 @@ void CBaseStarEntry::load(Common::SeekableReadStream &s) {
_field1 = s.readByte();
_field2 = s.readByte();
_field3 = s.readByte();
- *((uint32 *)&_value) = s.readUint32LE(); // FIXME
+ _value = s.readFloatLE();
_val._v1 = s.readUint32LE();
_val._v2 = s.readUint32LE();
_val._v3 = s.readUint32LE();
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index a1c4f33..2aaf5d7 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -129,7 +129,7 @@ void CStarControl::newFrame() {
// TODO
}
-void CStarControl::fn1(int action) {
+void CStarControl::doAction(int action) {
// TODO
}
diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h
index 0ee7c65..1a07e66 100644
--- a/engines/titanic/star_control/star_control.h
+++ b/engines/titanic/star_control/star_control.h
@@ -68,7 +68,10 @@ public:
*/
virtual void draw(CScreenManager *screenManager);
- void fn1(int action);
+ /**
+ * Does an action in the star control
+ */
+ void doAction(int action);
/**
* Returns true if the starfield puzzle has been solved
More information about the Scummvm-git-logs
mailing list