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/support | |
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/support')
-rw-r--r-- | engines/titanic/support/avi_surface.cpp | 8 | ||||
-rw-r--r-- | engines/titanic/support/credit_text.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/support/direct_draw.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/support/image.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/support/mouse_cursor.cpp | 7 | ||||
-rw-r--r-- | engines/titanic/support/movie.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/support/screen_manager.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/support/strings.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/support/text_cursor.cpp | 3 |
9 files changed, 29 insertions, 8 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 7673c37c37..a7d6ef5fb6 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -20,13 +20,15 @@ * */ -#include "common/system.h" -#include "graphics/pixelformat.h" -#include "video/avi_decoder.h" #include "titanic/support/avi_surface.h" #include "titanic/support/screen_manager.h" #include "titanic/support/video_surface.h" +#include "titanic/events.h" #include "titanic/titanic.h" +#include "common/system.h" +#include "graphics/pixelformat.h" +#include "graphics/screen.h" +#include "video/avi_decoder.h" namespace Titanic { diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp index 6ee17a2b95..fa30bce988 100644 --- a/engines/titanic/support/credit_text.cpp +++ b/engines/titanic/support/credit_text.cpp @@ -21,6 +21,10 @@ */ #include "titanic/support/credit_text.h" +#include "titanic/core/game_object.h" +#include "titanic/events.h" +#include "titanic/support/files_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/direct_draw.cpp b/engines/titanic/support/direct_draw.cpp index 9fbfe0c5ee..71a90ad00d 100644 --- a/engines/titanic/support/direct_draw.cpp +++ b/engines/titanic/support/direct_draw.cpp @@ -20,11 +20,13 @@ * */ +#include "titanic/support/direct_draw.h" +#include "titanic/debugger.h" +#include "titanic/titanic.h" #include "common/debug.h" #include "engines/util.h" #include "graphics/pixelformat.h" -#include "titanic/support/direct_draw.h" -#include "titanic/titanic.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/image.cpp b/engines/titanic/support/image.cpp index 2da2179af0..1993f44c4c 100644 --- a/engines/titanic/support/image.cpp +++ b/engines/titanic/support/image.cpp @@ -21,6 +21,7 @@ */ #include "titanic/support/image.h" +#include "titanic/support/files_manager.h" #include "image/bmp.h" #include "titanic/titanic.h" diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp index eb58296502..1c5e0da487 100644 --- a/engines/titanic/support/mouse_cursor.cpp +++ b/engines/titanic/support/mouse_cursor.cpp @@ -20,11 +20,16 @@ * */ -#include "graphics/cursorman.h" #include "titanic/support/mouse_cursor.h" +#include "titanic/support/screen_manager.h" #include "titanic/support/transparency_surface.h" #include "titanic/support/video_surface.h" +#include "titanic/events.h" +#include "titanic/input_handler.h" +#include "titanic/messages/mouse_messages.h" #include "titanic/titanic.h" +#include "graphics/cursorman.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index a57a84d5b0..56e7b7e6f2 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -21,9 +21,13 @@ */ #include "titanic/support/movie.h" +#include "titanic/core/game_object.h" +#include "titanic/events.h" +#include "titanic/messages/messages.h" #include "titanic/support/avi_surface.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/video_surface.h" #include "titanic/sound/sound_manager.h" -#include "titanic/messages/messages.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp index 3082344216..29cca4fc33 100644 --- a/engines/titanic/support/screen_manager.cpp +++ b/engines/titanic/support/screen_manager.cpp @@ -23,6 +23,7 @@ #include "titanic/support/screen_manager.h" #include "titanic/support/video_surface.h" #include "titanic/titanic.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/strings.cpp b/engines/titanic/support/strings.cpp index a8ab45800f..5ef2a6c6ac 100644 --- a/engines/titanic/support/strings.cpp +++ b/engines/titanic/support/strings.cpp @@ -21,6 +21,7 @@ */ #include "titanic/support/strings.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp index 1da98c1cf7..bf41fd30fb 100644 --- a/engines/titanic/support/text_cursor.cpp +++ b/engines/titanic/support/text_cursor.cpp @@ -20,10 +20,11 @@ * */ -#include "common/textconsole.h" #include "titanic/support/text_cursor.h" +#include "titanic/events.h" #include "titanic/support/screen_manager.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { |