VOYEUR: Cleanup of sDrawPic parameter usage and viewport initialisation

1 files changed, 6 insertions, 10 deletions

diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 57fbb0f880..d75c88ae0b 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -192,9 +192,13 @@ public:
 	bool openBoltLib(const Common::String &filename, BoltFile *&boltFile);
 };
 
-class PictureResource {
+class DisplayResource {
 public:
 	uint16 _flags;
+};
+
+class PictureResource: public DisplayResource {
+public:
 	byte _select;
 	byte _pick;
 	byte _onOff;
@@ -204,13 +208,6 @@ public:
 	uint _planeSize;
 
 	byte *_imgData;
-
-	// TODO: Investigate further just why/how pictuers are chained
-	PictureResource *_secondPicture;
-	// TODO: Figure out if the following data is part of all pictures, or if
-	// only for certain types (when flags & 0x8000 != 0)
-	Common::Rect _bounds2;
-	Field86MethodPtr _field86;
 public:
 	PictureResource(BoltFilesState &state, const byte *src);
 	virtual ~PictureResource();
@@ -218,14 +215,13 @@ public:
 
 typedef void (ViewPortResource::*ViewPortMethodPtr)();
 
-class ViewPortResource {
+class ViewPortResource: public DisplayResource {
 private:
 	BoltFilesState &_state;
 private:
 	void setupViewPort(PictureResource *page, Common::Rect *clipRect, ViewPortSetupPtr setupFn,
 		ViewPortAddPtr addFn, ViewPortRestorePtr restoreFn);
 public:
-	int _flags;
 	ViewPortResource *_next;
 	Common::Rect _bounds;
 	int _field18;