[Scummvm-cvs-logs] SF.net SVN: scummvm:[44644] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Oct 5 00:43:30 CEST 2009
Revision: 44644
http://scummvm.svn.sourceforge.net/scummvm/?rev=44644&view=rev
Author: fingolfin
Date: 2009-10-04 22:43:30 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
SCI: Really remove sci/gui/gui.h include from engine/state.h
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kevent.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/kmisc.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/state.h
scummvm/trunk/engines/sci/gui/gui.cpp
scummvm/trunk/engines/sci/gui/gui_font.h
scummvm/trunk/engines/sci/gui/gui_gfx.h
scummvm/trunk/engines/sci/gui/gui_screen.h
Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp 2009-10-04 22:43:30 UTC (rev 44644)
@@ -30,6 +30,7 @@
#include "sci/gfx/gfx_state_internal.h" // required for GfxPort, GfxVisual
#include "sci/console.h"
#include "sci/debug.h" // for g_debug_simulated_key
+#include "sci/gui/gui.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-10-04 22:43:30 UTC (rev 44644)
@@ -38,6 +38,7 @@
#include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual
#include "sci/gfx/seq_decoder.h"
+#include "sci/gui/gui.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp 2009-10-04 22:43:30 UTC (rev 44644)
@@ -32,6 +32,7 @@
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/engine/gc.h"
+#include "sci/gui/gui.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-10-04 22:43:30 UTC (rev 44644)
@@ -39,6 +39,7 @@
#include "sci/sfx/iterator.h"
#include "sci/engine/state.h"
#include "sci/engine/savegame.h"
+#include "sci/gui/gui.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-10-04 22:43:30 UTC (rev 44644)
@@ -44,7 +44,6 @@
#include "sci/engine/seg_manager.h"
#include "sci/gfx/gfx_system.h"
#include "sci/sfx/core.h"
-#include "sci/gui/gui.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-04 22:43:30 UTC (rev 44644)
@@ -28,6 +28,7 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
#include "sci/tools.h"
+#include "sci/gui/gui.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_windowmgr.h"
Modified: scummvm/trunk/engines/sci/gui/gui_font.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_font.h 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/gui/gui_font.h 2009-10-04 22:43:30 UTC (rev 44644)
@@ -26,6 +26,8 @@
#ifndef SCI_GUI_FONT_H
#define SCI_GUI_FONT_H
+#include "sci/gui/gui.h"
+
namespace Sci {
class SciGUIfont {
Modified: scummvm/trunk/engines/sci/gui/gui_gfx.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.h 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.h 2009-10-04 22:43:30 UTC (rev 44644)
@@ -26,6 +26,8 @@
#ifndef SCI_GUI_GFX_H
#define SCI_GUI_GFX_H
+#include "sci/gui/gui.h"
+
namespace Sci {
#define SCI_PATTERN_CODE_RECTANGLE 0x10
Modified: scummvm/trunk/engines/sci/gui/gui_screen.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.h 2009-10-04 22:35:04 UTC (rev 44643)
+++ scummvm/trunk/engines/sci/gui/gui_screen.h 2009-10-04 22:43:30 UTC (rev 44644)
@@ -26,6 +26,8 @@
#ifndef SCI_GUI_SCREEN_H
#define SCI_GUI_SCREEN_H
+#include "sci/gui/gui.h"
+
namespace Sci {
#define SCI_SCREEN_MAXHEIGHT 400
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list