diff options
| -rw-r--r-- | mac/mac.cpp | 8 | ||||
| -rw-r--r-- | scummvm.cpp | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mac/mac.cpp b/mac/mac.cpp index 211ca09c99..7d32c4c21a 100644 --- a/mac/mac.cpp +++ b/mac/mac.cpp @@ -124,6 +124,8 @@ int sel; Scumm scumm; ScummDebugger debugger; Gui gui; +SoundEngine sound; +SOUND_DRIVER_TYPE snd_driv; WndMan wm[1]; byte veryFastMode; @@ -294,7 +296,7 @@ static pascal OSStatus EventHandler( EventHandlerCallRef inCallRef, EventRef inE void pc_loop() { int delta; - int last_time, new_time; + int last_time, new_time, old_time = TickCount(); delta = 0; do { @@ -304,6 +306,8 @@ void pc_loop() waitForTimer(&scumm, delta * 15 + last_time - new_time); last_time = TickCount(); + sound.on_timer(); + if(gui._active) { gui.loop(); delta = 3; @@ -894,6 +898,8 @@ void main(void) wm->_vgabuf = (byte*)calloc(320,200); wm->_scumm = &scumm; + sound.initialize(&scumm,&snd_driv); + scumm._gui = &gui; scumm.scummMain(2, &gameTitle); diff --git a/scummvm.cpp b/scummvm.cpp index a42e203c20..5bd2d6276b 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -540,6 +540,7 @@ NextArg:; //sprintf(_gameDataPath, ":%s:", *argv); //_gameDataPath = *argv; + _midi_driver = 4; _exe_name = *argv; #endif |