thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors

Browse source 
svn-id: r49535
This commit is contained in:
Willem Jan Palenstijn 2010-06-09 08:49:37 +00:00
parent 5cb311ee2c
commit 95b080f60b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/kmisc.cpp
View file

@ -80,7 +80,7 @@ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) {
uint32 duration = curTime - s->_throttleLastTime; uint32 duration = curTime - s->_throttleLastTime;
if (duration < neededSleep) { if (duration < neededSleep) {
s->_event->sleep(neededSleep - duration); g_sci->getEventManager()->sleep(neededSleep - duration);
s->_throttleLastTime = g_system->getMillis(); s->_throttleLastTime = g_system->getMillis();
} else { } else {
s->_throttleLastTime = curTime; s->_throttleLastTime = curTime;

6
engines/sci/graphics/gui.cpp
View file

@ -59,7 +59,7 @@ SciGui::SciGui(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCa
// then it should init it! // then it should init it!
_coordAdjuster = new GfxCoordAdjuster16(_ports); _coordAdjuster = new GfxCoordAdjuster16(_ports);
g_sci->_gfxCoordAdjuster = _coordAdjuster; 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); _compare = new GfxCompare(_s->_segMan, g_sci->getKernel(), _cache, _screen, _coordAdjuster);
g_sci->_gfxCompare = _compare; g_sci->_gfxCompare = _compare;
_transitions = new GfxTransitions(this, _screen, _palette, g_sci->getResMan()->isVGA()); _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); _text16 = new GfxText16(g_sci->getResMan(), _cache, _ports, _paint16, _screen);
_controls = new GfxControls(_s->_segMan, _ports, _paint16, _text16, _screen); _controls = new GfxControls(_s->_segMan, _ports, _paint16, _text16, _screen);
g_sci->_gfxControls = _controls; 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; 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) { 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 // TODO: cache portraits
// adjust given coordinates to curPort (but dont adjust coordinates on upscaledHires_Save_Box and give us hires coordinates // 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) // on kDrawCel, yeah this whole stuff makes sense)