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/game | |
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/game')
-rw-r--r-- | engines/titanic/game/missiveomat.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/game/music_console_button.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/game/parrot/parrot_lobby_link_updater.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/game/sgt/bedhead.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/game/television.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/game/transport/lift.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/game/transport/lift_indicator.cpp | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp index 9ae2a0e99f..c2f181d529 100644 --- a/engines/titanic/game/missiveomat.cpp +++ b/engines/titanic/game/missiveomat.cpp @@ -22,6 +22,7 @@ #include "titanic/game/missiveomat.h" #include "titanic/core/room_item.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/music_console_button.cpp b/engines/titanic/game/music_console_button.cpp index 872202891c..5da4c74022 100644 --- a/engines/titanic/game/music_console_button.cpp +++ b/engines/titanic/game/music_console_button.cpp @@ -22,6 +22,7 @@ #include "titanic/game/music_console_button.h" #include "titanic/core/room_item.h" +#include "titanic/sound/music_room.h" #include "titanic/sound/music_room_handler.h" #include "titanic/titanic.h" diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp index c32a06db39..a28e3017c9 100644 --- a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp +++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/parrot/parrot_lobby_link_updater.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp index 756111bf11..7775ad38dc 100644 --- a/engines/titanic/game/sgt/bedhead.cpp +++ b/engines/titanic/game/sgt/bedhead.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/bedhead.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp index 80404fa9d3..7c1e33cce4 100644 --- a/engines/titanic/game/television.cpp +++ b/engines/titanic/game/television.cpp @@ -21,11 +21,11 @@ */ #include "titanic/game/television.h" -#include "titanic/game/get_lift_eye2.h" -#include "titanic/core/project_item.h" #include "titanic/carry/magazine.h" +#include "titanic/core/project_item.h" +#include "titanic/debugger.h" +#include "titanic/game/get_lift_eye2.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp index 17f1783494..2dfede3d63 100644 --- a/engines/titanic/game/transport/lift.cpp +++ b/engines/titanic/game/transport/lift.cpp @@ -21,9 +21,9 @@ */ #include "titanic/game/transport/lift.h" -#include "titanic/pet_control/pet_control.h" +#include "titanic/debugger.h" #include "titanic/moves/multi_move.h" -#include "titanic/titanic.h" +#include "titanic/pet_control/pet_control.h" namespace Titanic { diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp index 37fa7a0dba..c0616a99aa 100644 --- a/engines/titanic/game/transport/lift_indicator.cpp +++ b/engines/titanic/game/transport/lift_indicator.cpp @@ -22,8 +22,8 @@ #include "titanic/game/transport/lift_indicator.h" #include "titanic/game/transport/lift.h" +#include "titanic/debugger.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { |