diff options
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r-- | engines/sci/graphics/animate.h | 18 | ||||
-rw-r--r-- | engines/sci/graphics/controls.h | 6 | ||||
-rw-r--r-- | engines/sci/graphics/helpers.h | 26 |
3 files changed, 24 insertions, 26 deletions
diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h index c0fddec3cc..f68e0123ea 100644 --- a/engines/sci/graphics/animate.h +++ b/engines/sci/graphics/animate.h @@ -56,6 +56,24 @@ enum ViewScaleSignals { kScaleSignalUnknown2 = 0x0004 // really unknown }; +struct AnimateEntry { + reg_t object; + GuiResourceId viewId; + int16 loopNo; + int16 celNo; + int16 paletteNo; + int16 x, y, z; + int16 priority; + uint16 signal; + uint16 scaleSignal; + int16 scaleX; + int16 scaleY; + Common::Rect celRect; + bool showBitsFlag; + reg_t castHandle; +}; +typedef Common::List<AnimateEntry *> AnimateList; + class GfxCache; class GfxPorts; class GfxPaint16; diff --git a/engines/sci/graphics/controls.h b/engines/sci/graphics/controls.h index 5f2194f258..1c4b7e3766 100644 --- a/engines/sci/graphics/controls.h +++ b/engines/sci/graphics/controls.h @@ -28,6 +28,12 @@ namespace Sci { +enum controlStateFlags { + kControlStateEnabled = 0x0001, ///< 0001 - enabled buttons + kControlStateDisabled = 0x0004, ///< 0010 - grayed out buttons + kControlStateFramed = 0x0008, ///< 1000 - widgets surrounded by a frame +}; + class GfxPorts; class GfxPaint16; class Font; diff --git a/engines/sci/graphics/helpers.h b/engines/sci/graphics/helpers.h index 7db6fa0d4a..f0ffecfb59 100644 --- a/engines/sci/graphics/helpers.h +++ b/engines/sci/graphics/helpers.h @@ -79,24 +79,6 @@ struct Window : public Port { } }; -struct AnimateEntry { - reg_t object; - GuiResourceId viewId; - int16 loopNo; - int16 celNo; - int16 paletteNo; - int16 x, y, z; - int16 priority; - uint16 signal; - uint16 scaleSignal; - int16 scaleX; - int16 scaleY; - Common::Rect celRect; - bool showBitsFlag; - reg_t castHandle; -}; -typedef Common::List<AnimateEntry *> AnimateList; - struct Color { byte used; byte r, g, b; @@ -114,14 +96,6 @@ struct PalSchedule { uint32 schedule; }; -/** Button and frame control flags. */ -enum controlStateFlags { - kControlStateEnabled = 0x0001, ///< 0001 - enabled buttons (used by the interpreter) - kControlStateDisabled = 0x0004, ///< 0010 - grayed out buttons (used by the interpreter) - kControlStateFramed = 0x0008, ///< 1000 - widgets surrounded by a frame (used by the interpreter) - kControlStateDitherFramed = 0x1000 ///< 0001 0000 0000 0000 - widgets surrounded by a dithered frame (used in kgraphics) -}; - enum ViewType { kViewUnknown, kViewEga, |