aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-26 22:17:42 -0400
committerPaul Gilbert2016-05-26 22:17:42 -0400
commit4d933a15f65809afa330622339a200f15cb19eeb (patch)
tree69cf37f0b24429ab62b5ec45d90b72914e7ad11f
parent4a88f39cc93a776fb63cf48f27856b06f042eceb (diff)
downloadscummvm-rg350-4d933a15f65809afa330622339a200f15cb19eeb.tar.gz
scummvm-rg350-4d933a15f65809afa330622339a200f15cb19eeb.tar.bz2
scummvm-rg350-4d933a15f65809afa330622339a200f15cb19eeb.zip
VOYEUR: Reorder ViewPortResource fields to fix VS packing warnings
-rw-r--r--engines/voyeur/files.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 8726b38ddf..92b43958d3 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);