diff options
-rw-r--r-- | engines/sci/gui/gui_font.cpp | 4 | ||||
-rw-r--r-- | engines/sci/gui/gui_font.h | 3 | ||||
-rw-r--r-- | engines/sci/gui/gui_gfx.cpp | 6 | ||||
-rw-r--r-- | engines/sci/gui/gui_picture.cpp | 4 | ||||
-rw-r--r-- | engines/sci/gui/gui_picture.h | 3 |
5 files changed, 9 insertions, 11 deletions
diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/gui/gui_font.cpp index c27ae35930..9e420cfb3a 100644 --- a/engines/sci/gui/gui_font.cpp +++ b/engines/sci/gui/gui_font.cpp @@ -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); } diff --git a/engines/sci/gui/gui_font.h b/engines/sci/gui/gui_font.h index 437a572b43..1b0776e1d5 100644 --- a/engines/sci/gui/gui_font.h +++ b/engines/sci/gui/gui_font.h @@ -27,7 +27,7 @@ namespace Sci { 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 @@ public: private: void initData(sciResourceId resourceId); - OSystem *_system; EngineState *_s; SciGUIscreen *_screen; diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index fe1be61d80..fcac407a91 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -344,14 +344,14 @@ sciResourceId SciGUIgfx::GetFontId() { 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::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control) 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); diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp index 4e51e38653..c3c5916a0a 100644 --- a/engines/sci/gui/gui_picture.cpp +++ b/engines/sci/gui/gui_picture.cpp @@ -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); } diff --git a/engines/sci/gui/gui_picture.h b/engines/sci/gui/gui_picture.h index 19922e8d2f..14704372e1 100644 --- a/engines/sci/gui/gui_picture.h +++ b/engines/sci/gui/gui_picture.h @@ -32,7 +32,7 @@ namespace Sci { 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 @@ private: 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; |