diff options
| author | Paul Gilbert | 2013-05-31 21:03:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-05-31 21:03:16 -0400 |
| commit | 4279eedceb261e3c179343b15d2e6841dc0bd43b (patch) | |
| tree | cb6128c093a6052ee108a27131a967bd2990fb17 /engines/voyeur/graphics.h | |
| parent | 43d31cc33424c053e8f42c7fcb5f18b422ef1ef9 (diff) | |
| download | scummvm-rg350-4279eedceb261e3c179343b15d2e6841dc0bd43b.tar.gz scummvm-rg350-4279eedceb261e3c179343b15d2e6841dc0bd43b.tar.bz2 scummvm-rg350-4279eedceb261e3c179343b15d2e6841dc0bd43b.zip | |
VOYEUR: Cleanup of sDrawPic parameter usage and viewport initialisation
Diffstat (limited to 'engines/voyeur/graphics.h')
| -rw-r--r-- | engines/voyeur/graphics.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/voyeur/graphics.h b/engines/voyeur/graphics.h index d17b18d3b0..f7e43ff65a 100644 --- a/engines/voyeur/graphics.h +++ b/engines/voyeur/graphics.h @@ -38,14 +38,14 @@ namespace Voyeur { class VoyeurEngine; class GraphicsManager; +class DisplayResource; class PictureResource; class ViewPortResource; typedef void (GraphicsManager::*GraphicMethodPtr)(); typedef void (GraphicsManager::*ViewPortSetupPtr)(ViewPortResource *); -typedef void (GraphicsManager::*ViewPortAddPtr)(ViewPortResource *, void *v2, void *v3); +typedef void (GraphicsManager::*ViewPortAddPtr)(ViewPortResource *, int y, Common::Rect *bounds); typedef void (GraphicsManager::*ViewPortRestorePtr)(ViewPortResource *); -typedef void (GraphicsManager::*Field86MethodPtr)(void *pic, int y, Common::Rect &bounds); class GraphicsManager { public: @@ -57,7 +57,8 @@ public: int _SVGAPage; int _SVGAMode; int _SVGAReset; - ViewPortResource *_vPort; + Common::Array<ViewPortResource *> *_viewPortListPtr; + ViewPortResource **_vPort; bool _MCGAMode; bool _saveBack; Common::Rect *_clipPtr; @@ -77,12 +78,14 @@ public: void addFadeInt(); void setupMCGASaveRect(ViewPortResource *viewPort); - void addRectOptSaveRect(ViewPortResource *viewPort, void *v2, void *v3); + void addRectOptSaveRect(ViewPortResource *viewPort, int y, Common::Rect *bounds); void restoreMCGASaveRect(ViewPortResource *viewPort); - void addRectNoSaveBack(ViewPortResource *viewPort, void *v2, void *v3); + void addRectNoSaveBack(ViewPortResource *viewPort, int y, Common::Rect *bounds); void EMSMapPageHandle(int v1, int v2, int v3); - void sDrawPic(PictureResource *srcPic, PictureResource *destPic, const Common::Point &offset, void *v3); + void sDrawPic(DisplayResource *srcDisplay, DisplayResource *destDisplay, const Common::Point &offset, void *v3); + void flipPage(); + void sWaitFlip(); }; } // End of namespace Voyeur |