aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2010-06-09 08:49:37 +0000
committerWillem Jan Palenstijn2010-06-09 08:49:37 +0000
commit95b080f60b74fe9b83d71abc9a80038f025845c6 (patch)
treed05537e067bb6f22a3ea8aac17bf2c2e2b014400 /engines/sci/graphics
parent5cb311ee2c352372e8eb494933e2bc36ffd5c4f5 (diff)
downloadscummvm-rg350-95b080f60b74fe9b83d71abc9a80038f025845c6.tar.gz
scummvm-rg350-95b080f60b74fe9b83d71abc9a80038f025845c6.tar.bz2
scummvm-rg350-95b080f60b74fe9b83d71abc9a80038f025845c6.zip
Fix compile errors
svn-id: r49535
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/gui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index e427edd732..df9227b87f 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -59,7 +59,7 @@ SciGui::SciGui(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCa
// then it should init it!
_coordAdjuster = new GfxCoordAdjuster16(_ports);
g_sci->_gfxCoordAdjuster = _coordAdjuster;
- _cursor->init(_coordAdjuster, _s->_event);
+ _cursor->init(_coordAdjuster, g_sci->getEventManager());
_compare = new GfxCompare(_s->_segMan, g_sci->getKernel(), _cache, _screen, _coordAdjuster);
g_sci->_gfxCompare = _compare;
_transitions = new GfxTransitions(this, _screen, _palette, g_sci->getResMan()->isVGA());
@@ -71,7 +71,7 @@ SciGui::SciGui(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCa
_text16 = new GfxText16(g_sci->getResMan(), _cache, _ports, _paint16, _screen);
_controls = new GfxControls(_s->_segMan, _ports, _paint16, _text16, _screen);
g_sci->_gfxControls = _controls;
- _menu = new GfxMenu(_s->_event, _s->_segMan, this, _ports, _paint16, _text16, _screen, _cursor);
+ _menu = new GfxMenu(g_sci->getEventManager(), _s->_segMan, this, _ports, _paint16, _text16, _screen, _cursor);
g_sci->_gfxMenu = _menu;
}
@@ -123,7 +123,7 @@ reg_t SciGui::portraitLoad(Common::String resourceName) {
}
void SciGui::portraitShow(Common::String resourceName, Common::Point position, uint16 resourceId, uint16 noun, uint16 verb, uint16 cond, uint16 seq) {
- Portrait *myPortrait = new Portrait(g_sci->getResMan(), _s->_event, this, _screen, _palette, _audio, resourceName);
+ Portrait *myPortrait = new Portrait(g_sci->getResMan(), g_sci->getEventManager(), this, _screen, _palette, _audio, resourceName);
// TODO: cache portraits
// adjust given coordinates to curPort (but dont adjust coordinates on upscaledHires_Save_Box and give us hires coordinates
// on kDrawCel, yeah this whole stuff makes sense)