thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Really remove sci/gui/gui.h include from engine/state.h

Browse source 
svn-id: r44644
This commit is contained in:
Max Horn 2009-10-04 22:43:30 +00:00
parent 670d8582ff
commit db8c6e3f6c
9 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/sci/engine/kevent.cpp
View file

@ -30,6 +30,7 @@
#include "sci/gfx/gfx_state_internal.h" // required for GfxPort, GfxVisual #include "sci/gfx/gfx_state_internal.h" // required for GfxPort, GfxVisual
#include "sci/console.h" #include "sci/console.h"
#include "sci/debug.h" // for g_debug_simulated_key #include "sci/debug.h" // for g_debug_simulated_key
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {

1
engines/sci/engine/kgraphics.cpp
View file

@ -38,6 +38,7 @@
#include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual #include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual
#include "sci/gfx/seq_decoder.h" #include "sci/gfx/seq_decoder.h"
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {

1
engines/sci/engine/kmisc.cpp
View file

@ -32,6 +32,7 @@
#include "sci/engine/state.h" #include "sci/engine/state.h"
#include "sci/engine/kernel.h" #include "sci/engine/kernel.h"
#include "sci/engine/gc.h" #include "sci/engine/gc.h"
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {

1
engines/sci/engine/savegame.cpp
View file

@ -39,6 +39,7 @@
#include "sci/sfx/iterator.h" #include "sci/sfx/iterator.h"
#include "sci/engine/state.h" #include "sci/engine/state.h"
#include "sci/engine/savegame.h" #include "sci/engine/savegame.h"
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {

1
engines/sci/engine/state.h
View file

@ -44,7 +44,6 @@ namespace Common {
#include "sci/engine/seg_manager.h" #include "sci/engine/seg_manager.h"
#include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_system.h"
#include "sci/sfx/core.h" #include "sci/sfx/core.h"
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {

1
engines/sci/gui/gui.cpp
View file

@ -28,6 +28,7 @@
#include "sci/sci.h" #include "sci/sci.h"
#include "sci/engine/state.h" #include "sci/engine/state.h"
#include "sci/tools.h" #include "sci/tools.h"
#include "sci/gui/gui.h"
#include "sci/gui/gui_screen.h" #include "sci/gui/gui_screen.h"
#include "sci/gui/gui_gfx.h" #include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_windowmgr.h" #include "sci/gui/gui_windowmgr.h"

2
engines/sci/gui/gui_font.h
View file

@ -26,6 +26,8 @@
#ifndef SCI_GUI_FONT_H #ifndef SCI_GUI_FONT_H
#define SCI_GUI_FONT_H #define SCI_GUI_FONT_H
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {
class SciGUIfont { class SciGUIfont {

2
engines/sci/gui/gui_gfx.h
View file

@ -26,6 +26,8 @@
#ifndef SCI_GUI_GFX_H #ifndef SCI_GUI_GFX_H
#define SCI_GUI_GFX_H #define SCI_GUI_GFX_H
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {
#define SCI_PATTERN_CODE_RECTANGLE 0x10 #define SCI_PATTERN_CODE_RECTANGLE 0x10

2
engines/sci/gui/gui_screen.h
View file

@ -26,6 +26,8 @@
#ifndef SCI_GUI_SCREEN_H #ifndef SCI_GUI_SCREEN_H
#define SCI_GUI_SCREEN_H #define SCI_GUI_SCREEN_H
#include "sci/gui/gui.h"
namespace Sci { namespace Sci {
#define SCI_SCREEN_MAXHEIGHT 400 #define SCI_SCREEN_MAXHEIGHT 400