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/true_talk | |
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/true_talk')
-rw-r--r-- | engines/titanic/true_talk/parrot_script.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_handler.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_support.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/true_talk/title_engine.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_concept.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_npc_script.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_parser.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_quotes.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_quotes_tree.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_script_base.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp | 4 |
12 files changed, 24 insertions, 12 deletions
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index 95ebbb5bfb..b3f25d0056 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -20,9 +20,10 @@ * */ -#include "common/textconsole.h" #include "titanic/true_talk/parrot_script.h" +#include "titanic/true_talk/true_talk_manager.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp index be0b89bc65..f716a96130 100644 --- a/engines/titanic/true_talk/script_handler.cpp +++ b/engines/titanic/true_talk/script_handler.cpp @@ -21,9 +21,10 @@ */ #include "titanic/true_talk/script_handler.h" +#include "titanic/true_talk/title_engine.h" #include "titanic/true_talk/tt_concept.h" -#include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/tt_parser.h" +#include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/tt_word.h" #include "titanic/titanic.h" diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp index 52676139f0..bba708fb78 100644 --- a/engines/titanic/true_talk/script_support.cpp +++ b/engines/titanic/true_talk/script_support.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/script_support.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/true_talk/title_engine.cpp b/engines/titanic/true_talk/title_engine.cpp index bfa97e3f92..23327014d6 100644 --- a/engines/titanic/true_talk/title_engine.cpp +++ b/engines/titanic/true_talk/title_engine.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/title_engine.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index a713688854..e2e411559f 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -22,8 +22,8 @@ #include "titanic/true_talk/true_talk_manager.h" #include "titanic/core/tree_item.h" -#include "titanic/npcs/true_talk_npc.h" #include "titanic/game_manager.h" +#include "titanic/npcs/true_talk_npc.h" #include "titanic/titanic.h" #define MKTAG_BE(a3,a2,a1,a0) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24))) diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp index b7ad0b3690..a1bb1bcc32 100644 --- a/engines/titanic/true_talk/tt_concept.cpp +++ b/engines/titanic/true_talk/tt_concept.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/tt_concept.h" +#include "titanic/true_talk/script_handler.h" #include "titanic/true_talk/tt_script_base.h" #include "titanic/true_talk/tt_word.h" #include "titanic/titanic.h" diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index f12d02c05f..2140f45203 100644 --- a/engines/titanic/true_talk/tt_npc_script.cpp +++ b/engines/titanic/true_talk/tt_npc_script.cpp @@ -20,15 +20,17 @@ * */ -#include "common/algorithm.h" -#include "common/textconsole.h" +#include "titanic/true_talk/tt_npc_script.h" +#include "titanic/core/project_item.h" +#include "titanic/game_manager.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/true_talk/tt_npc_script.h" +#include "titanic/support/files_manager.h" #include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/true_talk_manager.h" -#include "titanic/game_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp index 8c8157370a..49f233888b 100644 --- a/engines/titanic/true_talk/tt_parser.cpp +++ b/engines/titanic/true_talk/tt_parser.cpp @@ -21,7 +21,9 @@ */ #include "titanic/true_talk/tt_parser.h" +#include "titanic/support/files_manager.h" #include "titanic/true_talk/script_handler.h" +#include "titanic/true_talk/true_talk_manager.h" #include "titanic/true_talk/tt_action.h" #include "titanic/true_talk/tt_concept.h" #include "titanic/true_talk/tt_picture.h" diff --git a/engines/titanic/true_talk/tt_quotes.cpp b/engines/titanic/true_talk/tt_quotes.cpp index c1a1e16eea..2857a7bc6c 100644 --- a/engines/titanic/true_talk/tt_quotes.cpp +++ b/engines/titanic/true_talk/tt_quotes.cpp @@ -20,9 +20,10 @@ * */ -#include "common/algorithm.h" #include "titanic/true_talk/tt_quotes.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_quotes_tree.cpp b/engines/titanic/true_talk/tt_quotes_tree.cpp index e2293887a8..7fe3fe2b19 100644 --- a/engines/titanic/true_talk/tt_quotes_tree.cpp +++ b/engines/titanic/true_talk/tt_quotes_tree.cpp @@ -20,9 +20,10 @@ * */ -#include "common/algorithm.h" #include "titanic/true_talk/tt_quotes_tree.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_script_base.cpp b/engines/titanic/true_talk/tt_script_base.cpp index 5162f4dde6..7df8153098 100644 --- a/engines/titanic/true_talk/tt_script_base.cpp +++ b/engines/titanic/true_talk/tt_script_base.cpp @@ -20,9 +20,10 @@ * */ -#include "common/textconsole.h" #include "titanic/true_talk/tt_script_base.h" +#include "titanic/true_talk/script_handler.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 97a1cbb90a..20df6bd4bb 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -20,15 +20,15 @@ *
*/
-#include "common/file.h"
#include "titanic/true_talk/tt_vocab.h"
-#include "titanic/true_talk/tt_adj.h"
+#include "titanic/true_talk/script_handler.h"
#include "titanic/true_talk/tt_action.h"
#include "titanic/true_talk/tt_adj.h"
#include "titanic/true_talk/tt_major_word.h"
#include "titanic/true_talk/tt_picture.h"
#include "titanic/true_talk/tt_pronoun.h"
#include "titanic/titanic.h"
+#include "common/file.h"
namespace Titanic {
|