aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-12 15:41:19 +0000
committerFilippos Karapetis2009-10-12 15:41:19 +0000
commitcfc3af3466484dbd5cccefa1276716836d09e754 (patch)
tree83fd683bf00d0625608fd062b389c81f61d768cb /engines
parent61ac28abea2a2325fe9253e7439d86897d02cbc1 (diff)
downloadscummvm-rg350-cfc3af3466484dbd5cccefa1276716836d09e754.tar.gz
scummvm-rg350-cfc3af3466484dbd5cccefa1276716836d09e754.tar.bz2
scummvm-rg350-cfc3af3466484dbd5cccefa1276716836d09e754.zip
Minimize dependencies in the new gui
svn-id: r44988
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gui/gui_cursor.h2
-rw-r--r--engines/sci/gui/gui_font.h2
-rw-r--r--engines/sci/gui/gui_gfx.cpp2
-rw-r--r--engines/sci/gui/gui_palette.h2
4 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/gui/gui_cursor.h b/engines/sci/gui/gui_cursor.h
index 98ca7109a6..6a52dac498 100644
--- a/engines/sci/gui/gui_cursor.h
+++ b/engines/sci/gui/gui_cursor.h
@@ -26,8 +26,6 @@
#ifndef SCI_GUI_CURSOR_H
#define SCI_GUI_CURSOR_H
-#include "sci/gui/gui.h"
-
namespace Sci {
#define SCI_CURSOR_SCI0_HEIGHTWIDTH 16
diff --git a/engines/sci/gui/gui_font.h b/engines/sci/gui/gui_font.h
index 98b9fe1d3a..a6982779c1 100644
--- a/engines/sci/gui/gui_font.h
+++ b/engines/sci/gui/gui_font.h
@@ -26,7 +26,7 @@
#ifndef SCI_GUI_FONT_H
#define SCI_GUI_FONT_H
-#include "sci/gui/gui.h"
+#include "sci/gui/gui_helpers.h"
namespace Sci {
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index e26ac8bf9d..703b730e5b 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -30,12 +30,12 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
#include "sci/tools.h"
+#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_font.h"
#include "sci/gui/gui_picture.h"
#include "sci/gui/gui_view.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_gfx.h"
namespace Sci {
diff --git a/engines/sci/gui/gui_palette.h b/engines/sci/gui/gui_palette.h
index 1924dae7e6..5d7b3ba867 100644
--- a/engines/sci/gui/gui_palette.h
+++ b/engines/sci/gui/gui_palette.h
@@ -26,7 +26,7 @@
#ifndef SCI_GUI_PALETTE_H
#define SCI_GUI_PALETTE_H
-#include "sci/gui/gui.h"
+#include "sci/gui/gui_helpers.h"
namespace Sci {