diff options
| author | Paul Gilbert | 2017-02-24 23:30:17 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-24 23:30:17 -0500 |
| commit | e107003c4c83418a34fa15813fc4f3c7de473cf7 (patch) | |
| tree | 52ada0b29ac2b5aaea8ea26c54eea566410ead38 /engines/titanic/star_control | |
| parent | 985f8a3720873b6bfd2bd2cb5bcda78b24629e84 (diff) | |
| download | scummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.tar.gz scummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.tar.bz2 scummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.zip | |
TITANIC: Some preliminary cleanup of star control interfaces
Diffstat (limited to 'engines/titanic/star_control')
| -rw-r--r-- | engines/titanic/star_control/base_star.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp index f09df38620..a6ef6d8907 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 a1c4f33ad2..2aaf5d7640 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 0ee7c6530e..1a07e66ab7 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 |