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/npcs | |
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/npcs')
-rw-r--r-- | engines/titanic/npcs/barbot.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/callbot.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 4 |
5 files changed, 6 insertions, 4 deletions
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 21644bc150..2ba150a38c 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -21,6 +21,7 @@ */ #include "titanic/npcs/barbot.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 002af21e9b..56420ba0de 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -23,8 +23,8 @@ #include "titanic/npcs/bellbot.h" #include "titanic/carry/carry.h" #include "titanic/core/room_item.h" +#include "titanic/game_manager.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp index a5e8542db0..8d8f7ed07a 100644 --- a/engines/titanic/npcs/callbot.cpp +++ b/engines/titanic/npcs/callbot.cpp @@ -22,6 +22,7 @@ #include "titanic/npcs/callbot.h" #include "titanic/core/room_item.h" +#include "titanic/game_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index e8536c28a9..7567311ebb 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -22,7 +22,7 @@ #include "titanic/npcs/doorbot.h" #include "titanic/core/room_item.h" -#include "titanic/titanic.h" +#include "titanic/debugger.h" namespace Titanic { diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index c1b17950c6..d67fd3628e 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -22,9 +22,9 @@ #include "titanic/npcs/true_talk_npc.h" #include "titanic/core/view_item.h" -#include "titanic/pet_control/pet_control.h" +#include "titanic/debugger.h" #include "titanic/game_manager.h" -#include "titanic/titanic.h" +#include "titanic/pet_control/pet_control.h" namespace Titanic { |