[Scummvm-cvs-logs] SF.net SVN: scummvm:[49535] scummvm/trunk/engines/sci
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Wed Jun 9 10:49:37 CEST 2010
Revision: 49535
http://scummvm.svn.sourceforge.net/scummvm/?rev=49535&view=rev
Author: wjpalenstijn
Date: 2010-06-09 08:49:37 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
Fix compile errors
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kmisc.cpp
scummvm/trunk/engines/sci/graphics/gui.cpp
Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp 2010-06-09 07:59:42 UTC (rev 49534)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp 2010-06-09 08:49:37 UTC (rev 49535)
@@ -80,7 +80,7 @@
uint32 duration = curTime - s->_throttleLastTime;
if (duration < neededSleep) {
- s->_event->sleep(neededSleep - duration);
+ g_sci->getEventManager()->sleep(neededSleep - duration);
s->_throttleLastTime = g_system->getMillis();
} else {
s->_throttleLastTime = curTime;
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-06-09 07:59:42 UTC (rev 49534)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-06-09 08:49:37 UTC (rev 49535)
@@ -59,7 +59,7 @@
// 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 @@
_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 @@
}
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list