SCI: GfxCache is now also called directly w/o SciGui nor SciGui32

svn-id: r47759

1 files changed, 2 insertions, 19 deletions

diff --git a/engines/sci/graphics/gui32.cpp b/engines/sci/graphics/gui32.cpp
index f690ec68da..ed12c33757 100644
--- a/engines/sci/graphics/gui32.cpp
+++ b/engines/sci/graphics/gui32.cpp
@@ -44,10 +44,9 @@
 
 namespace Sci {
 
-SciGui32::SciGui32(EngineState *state, GfxScreen *screen, GfxPalette *palette, Cursor *cursor)
-	: _s(state), _screen(screen), _palette(palette), _cursor(cursor) {
+SciGui32::SciGui32(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, Cursor *cursor)
+	: _s(state), _screen(screen), _palette(palette), _cache(cache), _cursor(cursor) {
 
-	_cache = new GfxCache(_s->resMan, _screen, _palette);
 	_compare = new GfxCompare(_s->_segMan, _s->_kernel, _cache, _screen);
 }
 
@@ -217,22 +216,6 @@ void SciGui32::setCursorZone(Common::Rect zone) {
 	_cursor->setMoveZone(zone);
 }
 
-int16 SciGui32::getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo) {
-	return _cache->getView(viewId)->getCelInfo(loopNo, celNo)->width;
-}
-
-int16 SciGui32::getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo) {
-	return _cache->getView(viewId)->getCelInfo(loopNo, celNo)->height;
-}
-
-int16 SciGui32::getLoopCount(GuiResourceId viewId) {
-	return _cache->getView(viewId)->getLoopCount();
-}
-
-int16 SciGui32::getCelCount(GuiResourceId viewId, int16 loopNo) {
-	return _cache->getView(viewId)->getLoopInfo(loopNo)->celCount;
-}
-
 void SciGui32::syncWithFramebuffer() {
 	_screen->syncWithFramebuffer();
 }