[Scummvm-cvs-logs] scummvm master -> 48c439a0eb933b492af35e4524cb13ecdf95cc19

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48c439a0eb VOYEUR: Remove some more variables in ViewPortResource


Commit: 48c439a0eb933b492af35e4524cb13ecdf95cc19
    https://github.com/scummvm/scummvm/commit/48c439a0eb933b492af35e4524cb13ecdf95cc19
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T22:49:38-08:00

Commit Message:
VOYEUR: Remove some more variables in ViewPortResource

Changed paths:
    engines/voyeur/files.cpp
    engines/voyeur/files.h



diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 240f645..00219d5 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -1207,7 +1207,8 @@ ViewPortResource::ViewPortResource(BoltFilesState &state, const byte *src):
 	_pages[0] = state._curLibPtr->getPictureResource(READ_LE_UINT32(src + 0x28));
 	_pages[1] = state._curLibPtr->getPictureResource(READ_LE_UINT32(src + 0x2C));
 
-	state._curLibPtr->resolveIt(READ_LE_UINT32(src + 0x30), &_field30);
+	byte *dummy;
+	state._curLibPtr->resolveIt(READ_LE_UINT32(src + 0x30), &dummy);
 
 	// Get the rect list
 	for (int listIndex = 0; listIndex < 3; ++listIndex) {
@@ -1236,8 +1237,7 @@ ViewPortResource::ViewPortResource(BoltFilesState &state, const byte *src):
 	_clipRect = Common::Rect(xs, ys, xs + READ_LE_UINT16(src + 0x4A),
 		ys + READ_LE_UINT16(src + 0x4C));
 
-	state._curLibPtr->resolveIt(READ_LE_UINT32(src + 0x7A), &_field7A);
-
+	state._curLibPtr->resolveIt(READ_LE_UINT32(src + 0x7A), &dummy);
 	state._curLibPtr->resolveFunction(READ_LE_UINT32(src + 0x7E), (GraphicMethodPtr *)&_fn1);
 	state._curLibPtr->resolveFunction(READ_LE_UINT32(src + 0x82), (GraphicMethodPtr *)&_setupFn);
 	state._curLibPtr->resolveFunction(READ_LE_UINT32(src + 0x86), (GraphicMethodPtr *)&_addFn);
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 8c5f5d9..ffc5937 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -325,11 +325,9 @@ public:
 	int _pageIndex;
 	int _lastPage;
 	Common::Rect _bounds;
-	int _field18;  // Useless variable
 	PictureResource *_currentPic;
 	PictureResource *_activePage;
 	PictureResource *_pages[2];
-	byte *_field30;
 
 	// Rect lists and counts. Note that _rectListCount values of '-1' seem to have
 	// special significance, which is why I'm not making them redundant in favor 
@@ -338,7 +336,6 @@ public:
 	int _rectListCount[3];
 
 	Common::Rect _clipRect;
-	byte *_field7A;
 	GraphicMethodPtr _fn1;
 	ViewPortSetupPtr _setupFn;
 	ViewPortAddPtr _addFn;