diff options
Diffstat (limited to 'engines/titanic')
-rw-r--r-- | engines/titanic/star_control/base_stars.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/star_control/base_stars.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/camera_auto_mover.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/star_control/camera_auto_mover.h | 6 | ||||
-rw-r--r-- | engines/titanic/star_control/fmatrix.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/star_control/fmatrix.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/marked_auto_mover.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/marked_camera_mover.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/star_control/star_camera.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/star_control/star_camera.h | 12 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control.cpp | 9 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.cpp | 7 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.h | 7 | ||||
-rw-r--r-- | engines/titanic/star_control/unmarked_auto_mover.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/unmarked_camera_mover.cpp | 5 |
15 files changed, 50 insertions, 24 deletions
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp index 94208e7374..ba4877051b 100644 --- a/engines/titanic/star_control/base_stars.cpp +++ b/engines/titanic/star_control/base_stars.cpp @@ -23,6 +23,7 @@ #include "titanic/star_control/base_stars.h" #include "titanic/star_control/star_camera.h" #include "titanic/star_control/star_ref.h" +#include "titanic/support/simple_file.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/base_stars.h b/engines/titanic/star_control/base_stars.h index e77b20ec08..4333e3231e 100644 --- a/engines/titanic/star_control/base_stars.h +++ b/engines/titanic/star_control/base_stars.h @@ -23,7 +23,6 @@ #ifndef TITANIC_BASE_STARS_H #define TITANIC_BASE_STARS_H -#include "titanic/support/simple_file.h" #include "titanic/star_control/frange.h" #include "titanic/star_control/star_closeup.h" #include "titanic/star_control/surface_area.h" @@ -33,6 +32,7 @@ namespace Titanic { enum StarMode { MODE_STARFIELD = 0, MODE_PHOTO = 1 }; class CStarCamera; +class SimpleFile; struct CBaseStarEntry { byte _red; diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp index 45e5a9e03e..861248fc1f 100644 --- a/engines/titanic/star_control/camera_auto_mover.cpp +++ b/engines/titanic/star_control/camera_auto_mover.cpp @@ -21,8 +21,11 @@ */ #include "titanic/star_control/camera_auto_mover.h" +#include "titanic/star_control/fmatrix.h" +#include "titanic/star_control/error_code.h" #include "common/textconsole.h" + namespace Titanic { CCameraAutoMover::CCameraAutoMover() : _srcPos(0.0, 1000000.0, 0.0) { diff --git a/engines/titanic/star_control/camera_auto_mover.h b/engines/titanic/star_control/camera_auto_mover.h index 52938284ed..dc9cf6df45 100644 --- a/engines/titanic/star_control/camera_auto_mover.h +++ b/engines/titanic/star_control/camera_auto_mover.h @@ -23,13 +23,15 @@ #ifndef TITANIC_CAMERA_AUTO_MOVER_H #define TITANIC_CAMERA_AUTO_MOVER_H -#include "titanic/star_control/error_code.h" -#include "titanic/star_control/fmatrix.h" #include "titanic/star_control/fvector.h" #include "titanic/star_control/orientation_changer.h" +#include "common/array.h" namespace Titanic { +class CErrorCode; +class FMatrix; + /** * Base class for automatic movement of the starview camera */ diff --git a/engines/titanic/star_control/fmatrix.cpp b/engines/titanic/star_control/fmatrix.cpp index cd59c559ca..050d89bc67 100644 --- a/engines/titanic/star_control/fmatrix.cpp +++ b/engines/titanic/star_control/fmatrix.cpp @@ -22,6 +22,7 @@ #include "titanic/star_control/fmatrix.h" #include "titanic/star_control/daffine.h" +#include "titanic/support/simple_file.h" namespace Titanic { @@ -39,7 +40,7 @@ void matProd(const FMatrix &a, const FMatrix &m, FMatrix &C) { C._row3._z = a._row3._x * m._row1._z + a._row3._y * m._row2._z + a._row3._z * m._row3._z; } -// member functions +// Member functions FMatrix::FMatrix() : _row1(1.0, 0.0, 0.0), _row2(0.0, 1.0, 0.0), _row3(0.0, 0.0, 1.0) { diff --git a/engines/titanic/star_control/fmatrix.h b/engines/titanic/star_control/fmatrix.h index 00054ee7bb..6d118a73a6 100644 --- a/engines/titanic/star_control/fmatrix.h +++ b/engines/titanic/star_control/fmatrix.h @@ -23,13 +23,13 @@ #ifndef TITANIC_FMATRIX_H #define TITANIC_FMATRIX_H -#include "titanic/support/simple_file.h" #include "titanic/star_control/fvector.h" namespace Titanic { class DAffine; class DVector; +class SimpleFile; /** * Floating point matrix class. diff --git a/engines/titanic/star_control/marked_auto_mover.cpp b/engines/titanic/star_control/marked_auto_mover.cpp index 828fe03a95..e3ab2b4f20 100644 --- a/engines/titanic/star_control/marked_auto_mover.cpp +++ b/engines/titanic/star_control/marked_auto_mover.cpp @@ -21,6 +21,8 @@ */ #include "titanic/star_control/marked_auto_mover.h" +#include "titanic/star_control/error_code.h" +#include "common/array.h" #include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/star_control/marked_camera_mover.cpp b/engines/titanic/star_control/marked_camera_mover.cpp index 2e3fa8f448..61b7c05b60 100644 --- a/engines/titanic/star_control/marked_camera_mover.cpp +++ b/engines/titanic/star_control/marked_camera_mover.cpp @@ -21,6 +21,7 @@ */ #include "titanic/star_control/marked_camera_mover.h" +#include "common/array.h" #include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp index 76302d2266..37196b28ee 100644 --- a/engines/titanic/star_control/star_camera.cpp +++ b/engines/titanic/star_control/star_camera.cpp @@ -21,10 +21,14 @@ */ #include "titanic/star_control/star_camera.h" -#include "titanic/star_control/unmarked_camera_mover.h" -#include "titanic/star_control/marked_camera_mover.h" +#include "titanic/star_control/camera_mover.h" #include "titanic/star_control/daffine.h" #include "titanic/star_control/fmatrix.h" +#include "titanic/star_control/fpoint.h" +#include "titanic/star_control/marked_camera_mover.h" +#include "titanic/star_control/unmarked_camera_mover.h" +#include "titanic/star_control/error_code.h" +#include "titanic/support/simple_file.h" #include "titanic/titanic.h" namespace Titanic { @@ -53,6 +57,10 @@ void CStarCamera::deinit() { _newOrientation = nullptr; } +bool CStarCamera::isLocked() { + return _mover->isLocked(); +} + CStarCamera::~CStarCamera() { deleteHandler(); } diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h index 3cdea2aa85..856ef40c99 100644 --- a/engines/titanic/star_control/star_camera.h +++ b/engines/titanic/star_control/star_camera.h @@ -23,16 +23,18 @@ #ifndef TITANIC_STAR_CAMERA_H #define TITANIC_STAR_CAMERA_H -#include "titanic/support/simple_file.h" #include "titanic/star_control/fmatrix.h" -#include "titanic/star_control/fpoint.h" #include "titanic/star_control/base_stars.h" #include "titanic/star_control/viewport.h" -#include "titanic/star_control/camera_mover.h" -#include "titanic/star_control/error_code.h" namespace Titanic { +class CCameraMover; +class CErrorCode; +class CNavigationInfo; +class FPoint; +class SimpleFile; + enum StarLockState { ZERO_LOCKED=0, ONE_LOCKED=1, TWO_LOCKED=2, THREE_LOCKED=3 }; /** @@ -62,7 +64,7 @@ private: /** * Return whether the handler is locked */ - bool isLocked() { return _mover->isLocked(); } + bool isLocked(); public: static void init(); static void deinit(); diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index 92cedc9513..743cfd0979 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -20,17 +20,18 @@ * */ -#include "titanic/support/screen_manager.h" -#include "titanic/pet_control/pet_control.h" #include "titanic/star_control/star_control.h" #include "titanic/star_control/daffine.h" -#include "titanic/star_control/error_code.h" #include "titanic/star_control/fpose.h" +#include "titanic/star_control/camera_mover.h" #include "titanic/star_control/star_camera.h" -#include "titanic/game_manager.h" +#include "titanic/star_control/error_code.h" #include "titanic/core/dont_save_file_item.h" #include "titanic/core/project_item.h" #include "titanic/core/view_item.h" +#include "titanic/pet_control/pet_control.h" +#include "titanic/support/screen_manager.h" +#include "titanic/game_manager.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index 9b27fa470e..8e3da4420d 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -20,13 +20,16 @@ * */ -#include "titanic/support/screen_manager.h" #include "titanic/star_control/star_view.h" +#include "titanic/star_control/camera_mover.h" +#include "titanic/star_control/fvector.h" #include "titanic/star_control/star_control.h" #include "titanic/star_control/star_field.h" +#include "titanic/star_control/error_code.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/simple_file.h" #include "titanic/core/game_object.h" #include "titanic/messages/pet_messages.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h index 204c02336c..b7d50969a6 100644 --- a/engines/titanic/star_control/star_view.h +++ b/engines/titanic/star_control/star_view.h @@ -23,18 +23,17 @@ #ifndef TITANIC_STAR_VIEW_H #define TITANIC_STAR_VIEW_H -#include "titanic/support/simple_file.h" -#include "titanic/support/video_surface.h" #include "titanic/star_control/star_camera.h" #include "titanic/star_control/viewport.h" #include "titanic/star_control/surface_fader.h" -#include "titanic/star_control/error_code.h" -#include "titanic/star_control/fvector.h" namespace Titanic { +class CErrorCode; class CStarControl; class CStarField; +class CVideoSurface; +class FVector; class CStarView { private: diff --git a/engines/titanic/star_control/unmarked_auto_mover.cpp b/engines/titanic/star_control/unmarked_auto_mover.cpp index 4f38f68a40..5e74692ed5 100644 --- a/engines/titanic/star_control/unmarked_auto_mover.cpp +++ b/engines/titanic/star_control/unmarked_auto_mover.cpp @@ -21,6 +21,8 @@ */ #include "titanic/star_control/unmarked_auto_mover.h" +#include "titanic/star_control/error_code.h" +#include "common/array.h" #include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp index c92ed2bc11..ce42b3949d 100644 --- a/engines/titanic/star_control/unmarked_camera_mover.cpp +++ b/engines/titanic/star_control/unmarked_camera_mover.cpp @@ -21,10 +21,11 @@ */ #include "titanic/star_control/unmarked_camera_mover.h" -#include "titanic/star_control/daffine.h" #include "titanic/star_control/dvector.h" -#include "titanic/titanic.h" +#include "titanic/star_control/daffine.h" +#include "titanic/star_control/error_code.h" #include "common/textconsole.h" +#include "titanic/titanic.h" namespace Titanic { |