diff options
| author | Max Horn | 2009-10-07 23:04:13 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-07 23:04:13 +0000 |
| commit | 8498d769be544a7a4d0edbca894fa594f4723c8e (patch) | |
| tree | f4c68bc7b8f0bb8f4910dcc8d228114d9149f262 /engines/sci/gfx | |
| parent | 5d07a657f0619d197c8ababec32f1022a5d4f2e4 (diff) | |
| download | scummvm-rg350-8498d769be544a7a4d0edbca894fa594f4723c8e.tar.gz scummvm-rg350-8498d769be544a7a4d0edbca894fa594f4723c8e.tar.bz2 scummvm-rg350-8498d769be544a7a4d0edbca894fa594f4723c8e.zip | |
SCI: Reduce header interdepencies once again. Rule of thumb: Never include a header file from another header file unless you absolutely *must* do it; if possible, try to use class forwards instead, and include the headers from source files only
svn-id: r44767
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/gfx_driver.h | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 15 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resource.h | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_tools.h | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/engines/sci/gfx/gfx_driver.h b/engines/sci/gfx/gfx_driver.h index 19cd2f314f..8983111b5b 100644 --- a/engines/sci/gfx/gfx_driver.h +++ b/engines/sci/gfx/gfx_driver.h @@ -37,6 +37,8 @@ enum gfx_buffer_t { GFX_BUFFER_STATIC = 2 }; +class SciGuiScreen; + /** * Graphics driver. diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 851ba642b5..f1faa929b3 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -23,24 +23,25 @@ * */ -#ifndef SCI_GFX_GFX_resMan_H -#define SCI_GFX_GFX_resMan_H +#ifndef SCI_GFX_GFX_RESMAN_H +#define SCI_GFX_GFX_RESMAN_H + +#include "common/hashmap.h" +#include "common/rect.h" // FIXME/TODO: The name "(Graphics) resource manager", and the associated // filenames, are misleading. This should be renamed to "Graphics manager" // or something like that. #include "sci/gfx/gfx_resource.h" -#include "sci/gui/gui_palette.h" -#include "sci/resource.h" -#include "common/hashmap.h" -#include "common/rect.h" +#include "sci/resource.h" namespace Sci { struct gfx_bitmap_font_t; class ResourceManager; +class SciGuiPalette; enum gfx_resource_type_t { GFX_RESOURCE_TYPE_VIEW = 0, @@ -310,4 +311,4 @@ private: } // End of namespace Sci -#endif // SCI_GFX_GFX_RSMGR_H +#endif // SCI_GFX_GFX_RESMAN_H diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h index 63d43b6f74..7d1f279103 100644 --- a/engines/sci/gfx/gfx_resource.h +++ b/engines/sci/gfx/gfx_resource.h @@ -31,7 +31,6 @@ #define SCI_GFX_GFX_RESOURCE_H #include "sci/gfx/gfx_system.h" -#include "sci/gui/gui_screen.h" #include "sci/gfx/gfx_driver.h" #include "common/rect.h" diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h index 99f338cf06..5e615d650a 100644 --- a/engines/sci/gfx/gfx_tools.h +++ b/engines/sci/gfx/gfx_tools.h @@ -29,7 +29,6 @@ #include "graphics/pixelformat.h" #include "sci/gfx/gfx_system.h" -#include "sci/gui/gui_screen.h" #include "sci/gfx/gfx_driver.h" namespace Sci { |