diff options
author | Johannes Schickel | 2011-02-15 23:40:06 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-02-15 23:42:50 +0100 |
commit | a02454644af514c4f50b861cc718e2951d4c46dd (patch) | |
tree | e6385482a68f330f412e87aa33b049b4f5912911 /engines/sci/graphics/frameout.h | |
parent | 01d511bf1b6df74254a2f6bd3007e884cd0c0dde (diff) | |
parent | 369db4fdfd5dac16858505f91cb37f4ae386fe80 (diff) | |
download | scummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.tar.gz scummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.tar.bz2 scummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.zip |
Merge branch 'master' into osystem-palette
Conflicts:
backends/platform/wii/osystem_gfx.cpp
Diffstat (limited to 'engines/sci/graphics/frameout.h')
-rw-r--r-- | engines/sci/graphics/frameout.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index 93d61ba22e..347ecb9424 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -28,6 +28,8 @@ namespace Sci { +class GfxPicture; + struct PlaneEntry { reg_t object; uint16 priority; @@ -99,6 +101,7 @@ public: void addPlanePicture(reg_t object, GuiResourceId pictureId, uint16 startX); void deletePlanePictures(reg_t object); + void clear(); private: SegManager *_segMan; |