diff options
| author | Robert Göffringmann | 2003-07-01 01:29:29 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2003-07-01 01:29:29 +0000 |
| commit | 2c9a784be8fa44fdf250cf2abb541ea54436e91f (patch) | |
| tree | 6eae5d4a72cf6a529ff48bb04655fcb403759219 /sky/sky.cpp | |
| parent | ec64f23f22f7a0b74ffd180be99946afd5c10076 (diff) | |
| download | scummvm-rg350-2c9a784be8fa44fdf250cf2abb541ea54436e91f.tar.gz scummvm-rg350-2c9a784be8fa44fdf250cf2abb541ea54436e91f.tar.bz2 scummvm-rg350-2c9a784be8fa44fdf250cf2abb541ea54436e91f.zip | |
finished loading and saving, fixed grid bugs (some debugging code not yet removed), implemented fnLincTextModule
svn-id: r8682
Diffstat (limited to 'sky/sky.cpp')
| -rw-r--r-- | sky/sky.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp index 1f32882c08..c62064ed18 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -105,15 +105,22 @@ void SkyState::go() { while (1) { delay(_systemVars.gameSpeed); + /*if (_key_pressed == 'g') { + warning("loading grid"); + _skyLogic->_skyGrid->loadGrids(); + _key_pressed = 0; + }*/ if ((_key_pressed == 27) || (_key_pressed == 63)) { // 27 = escape, 63 = F5 _key_pressed = 0; _skyControl->doControlPanel(); } _skyMouse->mouseEngine((uint16)_sdl_mouse_x, (uint16)_sdl_mouse_y); _skyLogic->engine(); + //_skyScreen->forceRefresh(); _skyScreen->recreate(); _skyScreen->spriteEngine(); _skyScreen->flip(); + //_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(SkyLogic::_scriptVariables[SCREEN])); _system->update_screen(); } } @@ -127,13 +134,13 @@ void SkyState::initialise(void) { if (_detector->getMidiDriverType() == MD_ADLIB) { _systemVars.systemFlags |= SF_SBLASTER; - _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk); + _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system); } else { _systemVars.systemFlags |= SF_ROLAND; if (_detector->_native_mt32) - _skyMusic = new SkyMT32Music(_detector->createMidi(), _skyDisk); + _skyMusic = new SkyMT32Music(_detector->createMidi(), _skyDisk, _system); else - _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk); + _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk, _system); } if (isCDVersion()) _systemVars.systemFlags |= SF_ALLOW_SPEECH; @@ -156,7 +163,7 @@ void SkyState::initialise(void) { _timer = Engine::_timer; // initialize timer *after* _skyScreen has been initialized. _timer->installProcedure(&timerHandler, 1000000 / 50); //call 50 times per second - _skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _system, getSavePath()); + _skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _system, getSavePath()); } void SkyState::initItemList() { |