aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle/sound.cpp
diff options
context:
space:
mode:
authorStrangerke2013-08-11 12:53:01 +0200
committerStrangerke2013-08-11 12:53:01 +0200
commit4ddf729c0782d25b9e388291f197a15ecf2e0d66 (patch)
tree37142dca52530f64c795d1b119d5fe6dad1cced8 /engines/mortevielle/sound.cpp
parent17245005c340982d7cfe70c26980ce790a70ebc5 (diff)
downloadscummvm-rg350-4ddf729c0782d25b9e388291f197a15ecf2e0d66.tar.gz
scummvm-rg350-4ddf729c0782d25b9e388291f197a15ecf2e0d66.tar.bz2
scummvm-rg350-4ddf729c0782d25b9e388291f197a15ecf2e0d66.zip
MORTEVIELLE: Remove some useless code and variables
Diffstat (limited to 'engines/mortevielle/sound.cpp')
-rw-r--r--engines/mortevielle/sound.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index a39bdf5120..d1f8f789a9 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -99,8 +99,8 @@ void SoundManager::loadAmbiantSounds() {
}
/**
- * Speech function - Load Noise file
- * @remarks Originally called 'charge_bruit'
+ * Speech function - Load Noise files
+ * @remarks Originally called 'charge_bruit' and 'charge_bruit5'
*/
void SoundManager::loadNoise() {
Common::File f1, f2;
@@ -131,7 +131,7 @@ void SoundManager::regenbruit() {
void SoundManager::litph(tablint &t, int typ, int tempo) {
// Skip speech
- if (_vm->_speechManager._typlec == 0)
+ if (_vm->_speechManager._soundType == 0)
return;
if (!_vm->_speechManager._buildingSentence) {
@@ -148,9 +148,9 @@ void SoundManager::litph(tablint &t, int typ, int tempo) {
case 0: {
int val = _vm->_mem[(kAdrTroct * 16) + i];
i++;
- if (_vm->_speechManager._typlec == 0)
+ if (_vm->_speechManager._soundType == 0)
warning("TODO: vclas");
- else if (_vm->_speechManager._typlec == 1) {
+ else if (_vm->_speechManager._soundType == 1) {
debugC(5, kMortevielleSounds, "litph - duson");
const static int noiseAdr[] = {0, 17224,
17224, 33676,
@@ -196,7 +196,7 @@ void SoundManager::litph(tablint &t, int typ, int tempo) {
}
break;
case 4:
- if (_vm->_speechManager._typlec) {
+ if (_vm->_speechManager._soundType) {
i += 2;
} else {
// Speech