diff options
Diffstat (limited to 'engines/mortevielle/speech.cpp')
| -rw-r--r-- | engines/mortevielle/speech.cpp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp index aaa2c6a906..1037d0abe4 100644 --- a/engines/mortevielle/speech.cpp +++ b/engines/mortevielle/speech.cpp @@ -147,16 +147,6 @@ void SpeechManager::cctable(tablint &t) { } } -void SpeechManager::regenbruit() { - int i = kOffsetB3 + 8590; - int j = 0; - do { - _cfiphBuffer[j] = READ_BE_UINT16(&_vm->_mem[(kAdrNoise3 * 16) + i]); - i += 2; - ++j; - } while (i < kOffsetB3 + 8790); -} - /** * Load phoneme sound file * @remarks Originally called 'charge_phbruit' @@ -173,24 +163,6 @@ void SpeechManager::loadPhonemeSounds() { f.close(); } -/** - * Speech function - Load Noise file - * @remarks Originally called 'charge_bruit' - */ -void SpeechManager::loadNoise() { - Common::File f; - - if (!f.open("bruits")) //Translation: "noise" - error("Missing file - bruits"); - - f.read(&_vm->_mem[kAdrNoise * 16], 250 * 128); // 32000 - for (int i = 0; i < _noise5Size; ++i) - _vm->_mem[(kAdrNoise * 16) + 32000 + i] = _noise5Buf[i]; - f.read(&_vm->_mem[(kAdrNoise1 * 16) + kOffsetB1], 149 * 128); // 19072 - - f.close(); -} - void SpeechManager::trait_car() { byte d3; int d2, i; @@ -570,8 +542,8 @@ void SpeechManager::startSpeech(int rep, int ht, int typ) { cctable(_tbi); switch (typ) { case 1: - loadNoise(); - regenbruit(); + _vm->_soundManager.loadNoise(); + _vm->_soundManager.regenbruit(); break; case 2: //TODO: Only call it once |