diff options
| author | Colin Snover | 2016-08-19 11:53:04 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-19 15:23:10 -0500 |
| commit | da62a99a00c625886b1a3297387f1c164ce23861 (patch) | |
| tree | 847847c07db3f02e7f4f2a64b48899a176210b79 /engines | |
| parent | dc093742b3d92868019e2c826dbce5151ee4e48b (diff) | |
| download | scummvm-rg350-da62a99a00c625886b1a3297387f1c164ce23861.tar.gz scummvm-rg350-da62a99a00c625886b1a3297387f1c164ce23861.tar.bz2 scummvm-rg350-da62a99a00c625886b1a3297387f1c164ce23861.zip | |
SCI32: Remove unused ResourceManager from GfxFrameout
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/graphics/frameout.h | 3 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index e690a3eb4c..4e0aa22669 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -57,11 +57,10 @@ namespace Sci { -GfxFrameout::GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxPalette32 *palette, GfxTransitions32 *transitions, GfxCursor32 *cursor) : +GfxFrameout::GfxFrameout(SegManager *segMan, GfxPalette32 *palette, GfxTransitions32 *transitions, GfxCursor32 *cursor) : _isHiRes(ConfMan.getBool("enable_high_resolution_graphics")), _palette(palette), _cursor(cursor), - _resMan(resMan), _segMan(segMan), _transitions(transitions), _benchmarkingFinished(false), diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index 05e9e4e638..e4caffd9e5 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -42,11 +42,10 @@ class GfxFrameout { private: GfxCursor32 *_cursor; GfxPalette32 *_palette; - ResourceManager *_resMan; SegManager *_segMan; public: - GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxPalette32 *palette, GfxTransitions32 *transitions, GfxCursor32 *cursor); + GfxFrameout(SegManager *segMan, GfxPalette32 *palette, GfxTransitions32 *transitions, GfxCursor32 *cursor); ~GfxFrameout(); bool _isHiRes; diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index cb825389b2..6c51060296 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -736,7 +736,7 @@ void SciEngine::initGraphics() { _gfxCompare = new GfxCompare(_gamestate->_segMan, _gfxCache, nullptr, _gfxCoordAdjuster); _gfxPaint32 = new GfxPaint32(_gamestate->_segMan); _gfxTransitions32 = new GfxTransitions32(_gamestate->_segMan); - _gfxFrameout = new GfxFrameout(_gamestate->_segMan, _resMan, _gfxPalette32, _gfxTransitions32, _gfxCursor32); + _gfxFrameout = new GfxFrameout(_gamestate->_segMan, _gfxPalette32, _gfxTransitions32, _gfxCursor32); _gfxCursor32->init(_gfxFrameout->getCurrentBuffer()); _gfxText32 = new GfxText32(_gamestate->_segMan, _gfxCache); _gfxControls32 = new GfxControls32(_gamestate->_segMan, _gfxCache, _gfxText32); |