aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/gfx
diff options
context:
space:
mode:
authorDavid Fioramonti2017-08-24 04:05:49 -0700
committerDavid Fioramonti2017-08-24 04:06:54 -0700
commitc96b01b82e6213128bc03b1ed94fc2ebaf4f36d7 (patch)
tree2caab7226643fa79cf4791ecfb18af327a200d17 /engines/titanic/gfx
parent78ed19d42986c2fb2f310476196963ba6709010f (diff)
downloadscummvm-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/gfx')
-rw-r--r--engines/titanic/gfx/text_control.cpp1
-rw-r--r--engines/titanic/gfx/text_control.h8
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/titanic/gfx/text_control.cpp b/engines/titanic/gfx/text_control.cpp
index f731dbb340..d1d2e1c530 100644
--- a/engines/titanic/gfx/text_control.cpp
+++ b/engines/titanic/gfx/text_control.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/gfx/text_control.h"
+#include "titanic/support/strings.h"
#include "titanic/titanic.h"
namespace Titanic {
diff --git a/engines/titanic/gfx/text_control.h b/engines/titanic/gfx/text_control.h
index d4ef19a7cf..ddcb791062 100644
--- a/engines/titanic/gfx/text_control.h
+++ b/engines/titanic/gfx/text_control.h
@@ -24,18 +24,22 @@
#define TITANIC_TEXT_CONTROL_H
#include "common/keyboard.h"
-#include "titanic/support/simple_file.h"
#include "titanic/support/screen_manager.h"
-#include "titanic/support/text_cursor.h"
+#include "titanic/support/strings.h"
namespace Titanic {
+class CScreenManager;
+class CTextCursor;
+class SimpleFile;
+
class CTextControl {
struct ArrayEntry {
CString _line;
CString _rgb;
CString _string3;
};
+
private:
Common::Array<ArrayEntry> _array;
CString _lines;