aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-06 08:11:06 +0000
committerFilippos Karapetis2009-10-06 08:11:06 +0000
commit8e108cc0a0c76814ac533c51b361737ba5e8c867 (patch)
tree377f9deac1c2d779733ec60e8f11c638e3638174 /engines/sci/gui
parent467c883ae10dbdafbf134027984834dbd0881c52 (diff)
downloadscummvm-rg350-8e108cc0a0c76814ac533c51b361737ba5e8c867.tar.gz
scummvm-rg350-8e108cc0a0c76814ac533c51b361737ba5e8c867.tar.bz2
scummvm-rg350-8e108cc0a0c76814ac533c51b361737ba5e8c867.zip
Removed unused reference to OSystem
svn-id: r44691
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui_gfx.cpp4
-rw-r--r--engines/sci/gui/gui_view.cpp4
-rw-r--r--engines/sci/gui/gui_view.h3
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index 7e9c4f777d..049cac0313 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -1267,7 +1267,7 @@ void SciGuiGfx::drawPicture(GuiResourceId pictureId, uint16 style, bool addToFla
}
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 @@ void SciGuiGfx::SetNowSeen(reg_t objectReference) {
}
// 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
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp
index bf0efaf3f9..941eb7824f 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/gui/gui_view.cpp
@@ -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);
}
diff --git a/engines/sci/gui/gui_view.h b/engines/sci/gui/gui_view.h
index 89bdcc3332..6f7866447a 100644
--- a/engines/sci/gui/gui_view.h
+++ b/engines/sci/gui/gui_view.h
@@ -47,7 +47,7 @@ struct sciViewLoopInfo {
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 @@ private:
void initData(GuiResourceId resourceId);
void unpackCel(GuiViewLoopNo loopNo, GuiViewCelNo celNo, byte *outPtr, uint16 pixelCount);
- OSystem *_system;
EngineState *_s;
SciGuiGfx *_gfx;
SciGuiScreen *_screen;