[Scummvm-cvs-logs] SF.net SVN: scummvm:[44691] scummvm/trunk/engines/sci/gui

[thebluegr at users.sourceforge.net]

Revision: 44691
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44691&view=rev
Author:   thebluegr
Date:     2009-10-06 08:11:06 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
Removed unused reference to OSystem

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp
    scummvm/trunk/engines/sci/gui/gui_view.cpp
    scummvm/trunk/engines/sci/gui/gui_view.h

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-06 07:39:51 UTC (rev 44690)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-06 08:11:06 UTC (rev 44691)
@@ -1267,7 +1267,7 @@
 }
 
 void SciGuiGfx::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo) {
-	SciGuiView *view = new SciGuiView(_system, _s, this, _screen, viewId);
+	SciGuiView *view = new SciGuiView(_s, this, _screen, viewId);
 	Common::Rect rect(0, 0);
 	Common::Rect clipRect(0, 0);
 	if (view) {
@@ -1410,7 +1410,7 @@
 	}
 
 	// now get cel rectangle
-	view = new SciGuiView(_system, _s, this, _screen, viewId);
+	view = new SciGuiView(_s, this, _screen, viewId);
 	view->getCelRect(loopNo, celNo, x, y, z, &celRect);
 
 	// TODO: sometimes loop is negative. Check what it means

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-06 07:39:51 UTC (rev 44690)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-06 08:11:06 UTC (rev 44691)
@@ -32,8 +32,8 @@
 
 namespace Sci {
 
-SciGuiView::SciGuiView(OSystem *system, EngineState *state, SciGuiGfx *gfx, SciGuiScreen *screen, GuiResourceId resourceId)
-	: _system(system), _s(state), _gfx(gfx), _screen(screen), _resourceId(resourceId) {
+SciGuiView::SciGuiView(EngineState *state, SciGuiGfx *gfx, SciGuiScreen *screen, GuiResourceId resourceId)
+	: _s(state), _gfx(gfx), _screen(screen), _resourceId(resourceId) {
 	assert(resourceId != -1);
 	initData(resourceId);
 }

Modified: scummvm/trunk/engines/sci/gui/gui_view.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-06 07:39:51 UTC (rev 44690)
+++ scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-06 08:11:06 UTC (rev 44691)
@@ -47,7 +47,7 @@
 
 class SciGuiView {
 public:
-	SciGuiView(OSystem *system, EngineState *state, SciGuiGfx *gfx, SciGuiScreen *screen, GuiResourceId resourceId);
+	SciGuiView(EngineState *state, SciGuiGfx *gfx, SciGuiScreen *screen, GuiResourceId resourceId);
 	~SciGuiView();
 
 	// TODO: Remove gfx reference after putting palette things into SciGuiScreen
@@ -65,7 +65,6 @@
 	void initData(GuiResourceId resourceId);
 	void unpackCel(GuiViewLoopNo loopNo, GuiViewCelNo celNo, byte *outPtr, uint16 pixelCount);
 
-	OSystem *_system;
 	EngineState *_s;
 	SciGuiGfx *_gfx;
 	SciGuiScreen *_screen;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.