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

Big ugly hairy hack to remove Scumm class dependencies to the MidiEmu driver, and add streaming (ahah) emulation - someone please fix this as soon as possible :)

Browse source 
svn-id: r4349
This commit is contained in:
Nicolas Bacca 2002-05-18 20:12:41 +00:00
parent 3b4c6ceb0f
commit 427cc598e0
4 changed files with 60 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.cpp
View file

@ -32,6 +32,9 @@ GameDetector detector;
Gui gui;
Scumm *g_scumm;
/* FIXME */
OSystem *g_system;
SoundMixer *g_mixer;
Config * scummcfg;
@ -182,6 +185,8 @@ game settings!
MidiDriver *midi = detector.createMidi();
SimonState *simon = SimonState::create(system, midi);
g_system = simon->_system;
g_mixer = &simon->_mixer[0];
simon->_game = detector._gameId - GID_SIMON_FIRST;
simon->set_volume(detector._sfx_volume);
simon->_game_path = detector._gameDataPath;
@ -190,6 +195,8 @@ game settings!
} else {
Scumm *scumm = Scumm::createFromDetector(&detector, system);
g_scumm = scumm;
g_system = scumm->_system;
g_mixer = &scumm->_mixer[0];
g_scumm->_sound_volume_master = 0;
g_scumm->_sound_volume_music = detector._music_volume;
g_scumm->_sound_volume_sfx = detector._sfx_volume;