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

[thebluegr at users.sourceforge.net]

Revision: 44598
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44598&view=rev
Author:   thebluegr
Date:     2009-10-04 11:14:38 +0000 (Sun, 04 Oct 2009)

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

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

Modified: scummvm/trunk/engines/sci/gui/gui_font.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_font.cpp	2009-10-04 11:05:38 UTC (rev 44597)
+++ scummvm/trunk/engines/sci/gui/gui_font.cpp	2009-10-04 11:14:38 UTC (rev 44598)
@@ -31,8 +31,8 @@
 
 namespace Sci {
 
-SciGUIfont::SciGUIfont(OSystem *system, EngineState *state, SciGUIscreen *screen, sciResourceId resourceId)
-	: _system(system), _s(state), _screen(screen), _resourceId(resourceId) {
+SciGUIfont::SciGUIfont(EngineState *state, SciGUIscreen *screen, sciResourceId resourceId)
+	: _s(state), _screen(screen), _resourceId(resourceId) {
 	assert(resourceId != -1);
 	initData(resourceId);
 }

Modified: scummvm/trunk/engines/sci/gui/gui_font.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_font.h	2009-10-04 11:05:38 UTC (rev 44597)
+++ scummvm/trunk/engines/sci/gui/gui_font.h	2009-10-04 11:14:38 UTC (rev 44598)
@@ -27,7 +27,7 @@
 
 class SciGUIfont {
 public:
-	SciGUIfont(OSystem *system, EngineState *state, SciGUIscreen *screen, sciResourceId resourceId);
+	SciGUIfont(EngineState *state, SciGUIscreen *screen, sciResourceId resourceId);
 	~SciGUIfont();
 
 	sciResourceId getResourceId();
@@ -40,7 +40,6 @@
 private:
 	void initData(sciResourceId resourceId);
 
-	OSystem *_system;
 	EngineState *_s;
 	SciGUIscreen *_screen;
 

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-04 11:05:38 UTC (rev 44597)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-04 11:14:38 UTC (rev 44598)
@@ -344,14 +344,14 @@
 
 SciGUIfont *SciGUIgfx::GetFont() {
 	if ((_font == NULL) || (_font->getResourceId() != _curPort->fontId)) {
-		_font = new SciGUIfont(_system, _s, _screen, _curPort->fontId);
+		_font = new SciGUIfont(_s, _screen, _curPort->fontId);
 	}
 	return _font;
 }
 
 void SciGUIgfx::SetFont(sciResourceId fontId) {
 	if ((_font == NULL) || (_font->getResourceId() != fontId)) {
-		_font = new SciGUIfont(_system, _s, _screen, fontId);
+		_font = new SciGUIfont(_s, _screen, fontId);
 	}
 	_curPort->fontId = fontId;
 	_curPort->fontHeight = _font->getHeight();
@@ -1209,7 +1209,7 @@
 void SciGUIgfx::drawPicture(sciResourceId pictureId, uint16 style, bool addToFlag, sciResourceId paletteId) {
 	SciGUIpicture *picture;
 
-	picture = new SciGUIpicture(_system, _s, this, _screen, pictureId);
+	picture = new SciGUIpicture(_s, this, _screen, pictureId);
 	// do we add to a picture? if not -> clear screen
 	if (!addToFlag) {
 		ClearScreen(0);

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-04 11:05:38 UTC (rev 44597)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-04 11:14:38 UTC (rev 44598)
@@ -32,8 +32,8 @@
 
 namespace Sci {
 
-SciGUIpicture::SciGUIpicture(OSystem *system, EngineState *state, SciGUIgfx *gfx, SciGUIscreen *screen, sciResourceId resourceId)
-	: _system(system), _s(state), _gfx(gfx), _screen(screen), _resourceId(resourceId) {
+SciGUIpicture::SciGUIpicture(EngineState *state, SciGUIgfx *gfx, SciGUIscreen *screen, sciResourceId resourceId)
+	: _s(state), _gfx(gfx), _screen(screen), _resourceId(resourceId) {
 	assert(resourceId != -1);
 	initData(resourceId);
 }

Modified: scummvm/trunk/engines/sci/gui/gui_picture.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-04 11:05:38 UTC (rev 44597)
+++ scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-04 11:14:38 UTC (rev 44598)
@@ -32,7 +32,7 @@
 
 class SciGUIpicture {
 public:
-	SciGUIpicture(OSystem *system, EngineState *state, SciGUIgfx *gfx, SciGUIscreen *screen, sciResourceId resourceId);
+	SciGUIpicture(EngineState *state, SciGUIgfx *gfx, SciGUIscreen *screen, sciResourceId resourceId);
 	~SciGUIpicture();
 
 	sciResourceId getResourceId();
@@ -52,7 +52,6 @@
 	void vectorGetRelCoordsMed(byte *data, int &curPos, int16 oldx, int16 oldy, int16 &x, int16 &y);
 	void vectorGetPatternTexture(byte *data, int &curPos, int16 pattern_Code, int16 &pattern_Texture);
 
-	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.