diff options
author | Filippos Karapetis | 2009-10-28 13:20:30 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-10-28 13:20:30 +0000 |
commit | 04ab6bc9fc831702a26c229027dada1436509b83 (patch) | |
tree | 4b0ba4fe63ef9d7b0a1d868d4cec97c53dba397b /engines/sci/gfx/operations.h | |
parent | f28fe1b07423941c245e06376761054507d188c1 (diff) | |
download | scummvm-rg350-04ab6bc9fc831702a26c229027dada1436509b83.tar.gz scummvm-rg350-04ab6bc9fc831702a26c229027dada1436509b83.tar.bz2 scummvm-rg350-04ab6bc9fc831702a26c229027dada1436509b83.zip |
Enclose all of the old graphics code within the INCLUDE_OLDGFX safeguard (defined in sci.h)
svn-id: r45459
Diffstat (limited to 'engines/sci/gfx/operations.h')
-rw-r--r-- | engines/sci/gfx/operations.h | 65 |
1 files changed, 39 insertions, 26 deletions
diff --git a/engines/sci/gfx/operations.h b/engines/sci/gfx/operations.h index 1e3dd41b52..2f98bfbd2e 100644 --- a/engines/sci/gfx/operations.h +++ b/engines/sci/gfx/operations.h @@ -28,15 +28,20 @@ #ifndef SCI_GFX_GFX_OPERATIONS_H #define SCI_GFX_GFX_OPERATIONS_H +#include "sci/sci.h" // for INCLUDE_OLDGFX +#ifdef INCLUDE_OLDGFX #include "sci/gfx/gfx_resmgr.h" #include "sci/gfx/gfx_tools.h" #include "sci/gfx/gfx_system.h" +#endif #include "sci/uinput.h" #include "common/list.h" namespace Sci { +#ifdef INCLUDE_OLDGFX + struct TextFragment; /* Threshold in color index mode to differentiate between visible and non-visible stuff. @@ -86,8 +91,10 @@ enum gfx_box_shade_t { typedef Common::List<rect_t> DirtyRectList; +#endif // INCLUDE_OLDGFX struct GfxState { +#ifdef INCLUDE_OLDGFX rect_t clip_zone_unscaled; /**< The current UNSCALED clipping zone */ rect_t clip_zone; /**< The current SCALED clipping zone; a cached scaled version of clip_zone_unscaled */ @@ -109,15 +116,18 @@ struct GfxState { int pic_nr; /**< Number of the current pic */ int palette_nr; /**< Palette number of the current pic */ - Common::List<sci_event_t> _events; - gfxr_pic_t *pic, *pic_unscaled; /**< The background picture and its unscaled equivalent */ rect_t pic_port_bounds; /**< Picture port bounds */ DirtyRectList _dirtyRects; /**< Dirty rectangles */ +#endif + + Common::List<sci_event_t> _events; }; +#ifdef INCLUDE_OLDGFX + /** @name Fundamental operations */ /** @{ */ @@ -306,30 +316,6 @@ void gfxop_set_color(GfxState *state, gfx_color_t *color, int r, int g, int b, /** @} */ -/** @name Pointer and IO ops */ -/** @{ */ - -/** - * Suspends program execution for the specified amount of milliseconds. - * - * The mouse pointer will be redrawn continually, if applicable - * - * @param[in] state The state affected - * @param[in] msecs The amount of milliseconds to wait - */ -void gfxop_sleep(GfxState *state, uint32 msecs); - -/** - * Retrieves the next input event from the driver. - * - * @param[in] state The affected state - * @param[in] mask The event mask to poll from (see uinput.h) - * @return The next event in the driver's event queue, or a NONE event - * if no event matching the mask was found. - */ -sci_event_t gfxop_get_event(GfxState *state, unsigned int mask); -/** @} */ - /** @name View operations */ /** @{ */ @@ -537,6 +523,33 @@ void gfxdr_add_dirty(DirtyRectList &list, rect_t box); int _gfxop_clip(rect_t *rect, rect_t clipzone); /** @} */ +#endif // INCLUDE_OLDGFX + +/** @name Pointer and IO ops */ +/** @{ */ + +/** + * Suspends program execution for the specified amount of milliseconds. + * + * The mouse pointer will be redrawn continually, if applicable + * + * @param[in] state The state affected + * @param[in] msecs The amount of milliseconds to wait + */ +void gfxop_sleep(GfxState *state, uint32 msecs); + +/** + * Retrieves the next input event from the driver. + * + * @param[in] state The affected state + * @param[in] mask The event mask to poll from (see uinput.h) + * @return The next event in the driver's event queue, or a NONE event + * if no event matching the mask was found. + */ +sci_event_t gfxop_get_event(GfxState *state, unsigned int mask); +/** @} */ + + } // End of namespace Sci #endif // SCI_GFX_GFX_OPERATIONS_H |