aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/frameout.cpp
diff options
context:
space:
mode:
authorColin Snover2016-02-18 21:09:15 -0600
committerColin Snover2016-02-18 21:11:06 -0600
commit1c4778d57196f0d0df9dfdb66fd890a23d6c69b4 (patch)
treeb799c48eb387fffb098920b0c0f3f12c69c26cf5 /engines/sci/graphics/frameout.cpp
parentcca9fc918f9d9c89b5526cce43ea42a9a003735e (diff)
downloadscummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.tar.gz
scummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.tar.bz2
scummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.zip
SCI: Minor cleanup
1. Reorder member initialisations to match class member order 2. Use #pragma mark instead of comments for annotating sections 3. Remove useless >=0 checks on unsigned types
Diffstat (limited to 'engines/sci/graphics/frameout.cpp')
-rw-r--r--engines/sci/graphics/frameout.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 0bf5b4e9fa..4f837546f0 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -70,22 +70,22 @@ static int16 unknownCDefaults[2][16] = {
};
GfxFrameout::GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAdjuster *coordAdjuster, GfxCache *cache, GfxScreen *screen, GfxPalette32 *palette, GfxPaint32 *paint32) :
- _segMan(segMan),
- _resMan(resMan),
+ _isHiRes(false),
_cache(cache),
- _screen(screen),
_palette(palette),
+ _resMan(resMan),
+ _screen(screen),
+ _segMan(segMan),
_paint32(paint32),
- _isHiRes(false),
- _palMorphIsOn(false),
_showStyles(nullptr),
- _remapOccurred(false),
- _frameNowVisible(false),
// TODO: Stop using _gfxScreen
_currentBuffer(screen->getWidth(), screen->getHeight(), nullptr),
_priorityMap(screen->getWidth(), screen->getHeight(), nullptr),
+ _remapOccurred(false),
+ _frameNowVisible(false),
_screenRect(screen->getWidth(), screen->getHeight()),
- _overdrawThreshold(0) {
+ _overdrawThreshold(0),
+ _palMorphIsOn(false) {
_currentBuffer.setPixels(calloc(1, screen->getWidth() * screen->getHeight()));