diff options
| author | Jamieson Christian | 2003-05-26 22:03:04 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-26 22:03:04 +0000 |
| commit | dbad55e532ccd86085f7cb52aabedf5561f38c4b (patch) | |
| tree | 899802d6b2fc67a3527c410081faef5aaec1ed18 /scumm/scummvm.cpp | |
| parent | 5757ec8fc4c77733050aa0c50ac8cb5e7e4ffa32 (diff) | |
| download | scummvm-rg350-dbad55e532ccd86085f7cb52aabedf5561f38c4b.tar.gz scummvm-rg350-dbad55e532ccd86085f7cb52aabedf5561f38c4b.tar.bz2 scummvm-rg350-dbad55e532ccd86085f7cb52aabedf5561f38c4b.zip | |
Added Hoenicke's PC-speaker waveform generator
and script interpreter for GF_OLD_BUNDLE music resources.
We'll try to get the waveform generator into a
MidiDriver wrapper for use with the 'SPK' resources
of later games, but this is usable for now.
Great work, Hoenicke!
svn-id: r8023
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 33f0624562..72781bd743 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -31,6 +31,7 @@ #include "imuse_digi.h" #include "intern.h" #include "object.h" +#include "player_v2.h" #include "resource.h" #include "sound.h" #include "string.h" @@ -609,7 +610,14 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) if (_features & GF_AFTER_V7) { _imuseDigital = new IMuseDigital(this); _imuse = NULL; + _playerV2 = NULL; + } else if (_features & GF_OLD_BUNDLE && !(_features & GF_AFTER_V3)) { + debug (0, "Creating player"); + _playerV2 = new Player_V2(); + _imuse = NULL; + _imuseDigital = NULL; } else { + _playerV2 = NULL; _imuseDigital = NULL; _imuse = IMuse::create (syst, detector->createMidi()); if (_imuse) { @@ -650,6 +658,7 @@ Scumm::~Scumm () delete _sound; delete _imuse; delete _imuseDigital; + delete _playerV2; delete _languageBuffer; delete _audioNames; |