SCI/newgui: Cleanup

svn-id: r45478

2 files changed, 19 insertions, 20 deletions

diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 7997eeb07c..ecd593982d 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -667,26 +667,26 @@ void SciGui::moveCursor(Common::Point pos) {
 	// FIXME!
 }
 
-int16 SciGui::getCelWidth(int view, int loop, int cel) {
-	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, view);
-	sciViewCelInfo *celInfo = tmpView->getCelInfo(loop, cel);
-	int16 width = celInfo->width;
+int16 SciGui::getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo) {
+	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, viewId);
+	sciViewCelInfo *celInfo = tmpView->getCelInfo(loopNo, celNo);
+	int16 celWidth = celInfo->width;
 	delete tmpView;
 
-	return width;
+	return celWidth;
 }
 
-int16 SciGui::getCelHeight(int view, int loop, int cel) {
-	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, view);
-	sciViewCelInfo *celInfo = tmpView->getCelInfo(loop, cel);
-	int16 height = celInfo->height;
+int16 SciGui::getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo) {
+	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, viewId);
+	sciViewCelInfo *celInfo = tmpView->getCelInfo(loopNo, celNo);
+	int16 celHeight = celInfo->height;
 	delete tmpView;
 
-	return height;
+	return celHeight;
 }
 
-int16 SciGui::getLoopCount(int view) {
-	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, view);
+int16 SciGui::getLoopCount(GuiResourceId viewId) {
+	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, viewId);
 	if (!tmpView)
 		return -1;
 
@@ -696,12 +696,12 @@ int16 SciGui::getLoopCount(int view) {
 	return loopCount;
 }
 
-int16 SciGui::getCelCount(int view, int loop) {
-	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, view);
+int16 SciGui::getCelCount(GuiResourceId viewId, int16 loopNo) {
+	SciGuiView *tmpView = new SciGuiView(_s->resMan, _screen, _palette, viewId);
 	if (!tmpView)
 		return -1;
 
-	uint16 celCount = tmpView->getLoopInfo(loop)->celCount;
+	uint16 celCount = tmpView->getLoopInfo(loopNo)->celCount;
 	delete tmpView;
 
 	return celCount;
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 6c5ac46bdf..2fc129dd97 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -124,11 +124,11 @@ public:
 	virtual void setCursorPos(Common::Point pos);
 	virtual void moveCursor(Common::Point pos);
 
-	int16 getCelWidth(int view, int loop, int cel);
-	int16 getCelHeight(int view, int loop, int cel);
+	virtual int16 getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo);
+	virtual int16 getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo);
 
-	int16 getLoopCount(int view);
-	int16 getCelCount(int view, int loop);
+	virtual int16 getLoopCount(GuiResourceId viewId);
+	virtual int16 getCelCount(GuiResourceId viewId, int16 loopNo);
 
 	virtual bool debugUndither(bool flag);
 	virtual bool debugShowMap(int mapNo);
@@ -148,7 +148,6 @@ private:
 	virtual void addToPicSetPicNotValid();
 
 	SciGuiGfx *_gfx;
-//	SciGuiresources *_resources;
 	SciGuiWindowMgr *_windowMgr;
 	SciGuiAnimate *_animate;
 	SciGuiControls *_controls;