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/text.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/text.cpp')
| -rw-r--r-- | engines/cge/text.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp index 6076fdd8ff..3d67dd9445 100644 --- a/engines/cge/text.cpp +++ b/engines/cge/text.cpp @@ -38,7 +38,7 @@ Text *_text; Talk *_talk = NULL; Text::Text(CGEEngine *vm, const char *fname, int size) : _vm(vm) { - _cache = new Han[size]; + _cache = new Handler[size]; mergeExt(_fileName, fname, kSayExt); if (!VFile::exist(_fileName)) error("No talk (%s)\n", _fileName); @@ -55,7 +55,7 @@ Text::~Text() { } void Text::clear(int from, int upto) { - 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 >= from && p->_ref < upto) { p->_ref = 0; delete[] p->_text; @@ -66,7 +66,7 @@ void Text::clear(int from, int upto) { int Text::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 @@ -81,7 +81,7 @@ void Text::preload(int from, int upto) { if (tf._error) return; - Han *CacheLim = _cache + _size; + Handler *CacheLim = _cache + _size; char line[kLineMax + 1]; int n; @@ -97,7 +97,7 @@ void Text::preload(int from, int upto) { int ref = atoi(s); if (ref && ref >= from && ref < upto) { - Han *p = &_cache[find(ref)]; + Handler *p = &_cache[find(ref)]; if (p < CacheLim) { delete[] p->_text; @@ -150,7 +150,7 @@ char *Text::load(int idx, int ref) { if (s < line + n) ++s; - Han *p = &_cache[idx]; + Handler *p = &_cache[idx]; p->_ref = ref; if ((p->_text = new char[strlen(s) + 1]) == NULL) |