diff options
| author | David Fioramonti | 2017-08-24 04:05:49 -0700 |
|---|---|---|
| committer | David Fioramonti | 2017-08-24 04:06:54 -0700 |
| commit | c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7 (patch) | |
| tree | 2caab7226643fa79cf4791ecfb18af327a200d17 /engines/titanic/star_control | |
| parent | 78ed19d42986c2fb2f310476196963ba6709010f (diff) | |
| download | scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.tar.gz scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.tar.bz2 scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.zip | |
TITANIC: Reduce header includes for titanic.h
I reduced the header includes a lot in Titanic.h and forward
declared when I could. Titanic.h was including a lot and
a lot of functions that were including it were not using its
API. This will help make it more clear which implementation
files are using which class since they will just need to include
which ones they need.
I also moved the debug related items in Titanic.h into the debugger
header.
I also reordered several of the the header includes to be local to
global.
Diffstat (limited to 'engines/titanic/star_control')
| -rw-r--r-- | engines/titanic/star_control/base_stars.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_camera.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_field_base.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_points1.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_points2.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/star_control/unmarked_camera_mover.cpp | 3 | ||||
| -rw-r--r-- | engines/titanic/star_control/viewport.cpp | 1 |
7 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp index c22260ea98..9e182f9c75 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/files_manager.h" #include "titanic/support/simple_file.h" #include "titanic/titanic.h" diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp index 68427a3452..6b4527e79d 100644 --- a/engines/titanic/star_control/star_camera.cpp +++ b/engines/titanic/star_control/star_camera.cpp @@ -21,6 +21,7 @@ */ #include "titanic/star_control/star_camera.h" +#include "titanic/debugger.h" #include "titanic/star_control/camera_mover.h" #include "titanic/star_control/daffine.h" #include "titanic/star_control/fmatrix.h" diff --git a/engines/titanic/star_control/star_field_base.cpp b/engines/titanic/star_control/star_field_base.cpp index 7641e4a951..4df27bec29 100644 --- a/engines/titanic/star_control/star_field_base.cpp +++ b/engines/titanic/star_control/star_field_base.cpp @@ -21,8 +21,8 @@ */ #include "titanic/star_control/star_field_base.h" +#include "titanic/debugger.h" #include "titanic/star_control/star_camera.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_points1.cpp b/engines/titanic/star_control/star_points1.cpp index 91bcf953a8..44ff9e1d5e 100644 --- a/engines/titanic/star_control/star_points1.cpp +++ b/engines/titanic/star_control/star_points1.cpp @@ -22,6 +22,7 @@ #include "titanic/star_control/star_points1.h" #include "titanic/star_control/star_camera.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp index 2d239038bd..7d45dfc055 100644 --- a/engines/titanic/star_control/star_points2.cpp +++ b/engines/titanic/star_control/star_points2.cpp @@ -22,6 +22,7 @@ #include "titanic/star_control/star_points2.h" #include "titanic/star_control/star_camera.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp index ce42b3949d..644c946bb3 100644 --- a/engines/titanic/star_control/unmarked_camera_mover.cpp +++ b/engines/titanic/star_control/unmarked_camera_mover.cpp @@ -21,11 +21,12 @@ */ #include "titanic/star_control/unmarked_camera_mover.h" +#include "titanic/debugger.h" #include "titanic/star_control/dvector.h" #include "titanic/star_control/daffine.h" #include "titanic/star_control/error_code.h" -#include "common/textconsole.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp index 529b4bec3a..32f17f4f1c 100644 --- a/engines/titanic/star_control/viewport.cpp +++ b/engines/titanic/star_control/viewport.cpp @@ -21,6 +21,7 @@ */ #include "titanic/star_control/viewport.h" +#include "titanic/debugger.h" #include "titanic/titanic.h" namespace Titanic { |