[Scummvm-cvs-logs] scummvm master -> 4d933a15f65809afa330622339a200f15cb19eeb

dreammaster dreammaster at scummvm.org
Fri May 27 04:18:18 CEST 2016


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:
4d933a15f6 VOYEUR: Reorder ViewPortResource fields to fix VS packing warnings


Commit: 4d933a15f65809afa330622339a200f15cb19eeb
    https://github.com/scummvm/scummvm/commit/4d933a15f65809afa330622339a200f15cb19eeb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-05-26T22:17:42-04:00

Commit Message:
VOYEUR: Reorder ViewPortResource fields to fix VS packing warnings

Changed paths:
    engines/voyeur/files.h



diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 8726b38..92b4395 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -325,9 +325,13 @@ private:
 		ViewPortAddPtr addFn, ViewPortRestorePtr restoreFn);
 public:
 	ViewPortResource *_parent;
+	ViewPortSetupPtr _setupFn;
 	int _pageCount;
+	ViewPortAddPtr _addFn;
 	int _pageIndex;
+	ViewPortRestorePtr _restoreFn;
 	int _lastPage;
+	ScreenMethodPtr _fn1;
 	Common::Rect _bounds;
 	PictureResource *_currentPic;
 	PictureResource *_activePage;
@@ -340,10 +344,6 @@ public:
 	int _rectListCount[3];
 
 	Common::Rect _clipRect;
-	ScreenMethodPtr _fn1;
-	ViewPortSetupPtr _setupFn;
-	ViewPortAddPtr _addFn;
-	ViewPortRestorePtr _restoreFn;
 	Common::Rect _fontRect;
 public:
 	ViewPortResource(BoltFilesState &state, const byte *src);






More information about the Scummvm-git-logs mailing list