diff options
author | Strangerke | 2011-09-07 23:00:32 +0200 |
---|---|---|
committer | Strangerke | 2011-09-07 23:00:32 +0200 |
commit | 4b9d2c2516b5eb84945ee11bdc0b6a8fd1b82fd5 (patch) | |
tree | fb869754cb2c5f12f55c4f0aa120af79e046219b /engines/cge/sound.cpp | |
parent | 45de8747d5dd97dcad09667393fc0e534d199f3a (diff) | |
download | scummvm-rg350-4b9d2c2516b5eb84945ee11bdc0b6a8fd1b82fd5.tar.gz scummvm-rg350-4b9d2c2516b5eb84945ee11bdc0b6a8fd1b82fd5.tar.bz2 scummvm-rg350-4b9d2c2516b5eb84945ee11bdc0b6a8fd1b82fd5.zip |
CGE: Rename Han structures to Handler
Thanks to Fingolfin for pointing this out (as previous commit)
Diffstat (limited to 'engines/cge/sound.cpp')
-rw-r--r-- | engines/cge/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp index 547469aef8..6deb7f5020 100644 --- a/engines/cge/sound.cpp +++ b/engines/cge/sound.cpp @@ -96,7 +96,7 @@ void Sound::sndDigiStop(SmpInfo *PSmpInfo) { } Fx::Fx(int size) : _current(NULL) { - _cache = new Han[size]; + _cache = new Handler[size]; for (_size = 0; _size < size; _size++) { _cache[_size]._ref = 0; _cache[_size]._wav = NULL; @@ -109,7 +109,7 @@ Fx::~Fx() { } void Fx::clear() { - for (Han *p = _cache, *q = p + _size; p < q; p++) { + for (Handler *p = _cache, *q = p + _size; p < q; p++) { if (p->_ref) { p->_ref = 0; delete p->_wav; @@ -121,7 +121,7 @@ void Fx::clear() { int Fx::find(int ref) { int i = 0; - for (Han *p = _cache, *q = p + _size; p < q; p++) { + for (Handler *p = _cache, *q = p + _size; p < q; p++) { if (p->_ref == ref) break; else @@ -131,7 +131,7 @@ int Fx::find(int ref) { } void Fx::preload(int ref0) { - Han *cacheLim = _cache + _size; + Handler *cacheLim = _cache + _size; char filename[12]; for (int ref = ref0; ref < ref0 + 10; ref++) { @@ -139,7 +139,7 @@ void Fx::preload(int ref0) { VFile file = VFile(filename); DataCk *wav = loadWave(&file); if (wav) { - Han *p = &_cache[find(0)]; + Handler *p = &_cache[find(0)]; if (p >= cacheLim) break; p->_wav = wav; @@ -157,7 +157,7 @@ DataCk *Fx::load(int idx, int ref) { VFile file = VFile(filename); DataCk *wav = loadWave(&file); if (wav) { - Han *p = &_cache[idx]; + Handler *p = &_cache[idx]; p->_wav = wav; p->_ref = ref; } else { |