diff options
author | Strangerke | 2014-12-01 07:59:42 +0100 |
---|---|---|
committer | Paul Gilbert | 2014-12-12 22:54:08 -0500 |
commit | 9604da9da3fad69daca3604de618f5c91c293850 (patch) | |
tree | 2784e52e0b84b6fac3bcec37ccdbd0f0df2ab083 | |
parent | 0277d1654d23fa92d09bfb6486d0b7a9514e6403 (diff) | |
download | scummvm-rg350-9604da9da3fad69daca3604de618f5c91c293850.tar.gz scummvm-rg350-9604da9da3fad69daca3604de618f5c91c293850.tar.bz2 scummvm-rg350-9604da9da3fad69daca3604de618f5c91c293850.zip |
ACCESS: Rename _Eseg
-rw-r--r-- | engines/access/access.cpp | 4 | ||||
-rw-r--r-- | engines/access/access.h | 2 | ||||
-rw-r--r-- | engines/access/amazon/amazon_game.cpp | 28 |
3 files changed, 17 insertions, 17 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 6111ec7906..41706fc4fd 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -68,7 +68,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) _scaleI = 0; _imgUnscaled = false; _canSaveLoad = false; - _eseg = nullptr; + _establish = nullptr; _conversation = 0; _currentMan = 0; @@ -107,7 +107,7 @@ AccessEngine::~AccessEngine() { delete _video; freeCells(); - delete _eseg; + delete _establish; } void AccessEngine::setVGA() { diff --git a/engines/access/access.h b/engines/access/access.h index 2fdf619a35..eacdae9709 100644 --- a/engines/access/access.h +++ b/engines/access/access.h @@ -191,7 +191,7 @@ public: bool _imgUnscaled; bool _canSaveLoad; - Resource *_eseg; + Resource *_establish; int _et; int _printEnd; int _txtPages; diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index ba8b156e65..5b27eb24a2 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -165,26 +165,26 @@ void AmazonEngine::loadEstablish(int estabIndex) { int oldGroup = _establishGroup; _establishGroup = 0; - _eseg = _files->loadFile(_estTable[oldGroup]); - _establishCtrlTblOfs = READ_LE_UINT16(_eseg->data()); + _establish = _files->loadFile(_estTable[oldGroup]); + _establishCtrlTblOfs = READ_LE_UINT16(_establish->data()); int ofs = _establishCtrlTblOfs + (estabIndex * 2); - int idx = READ_LE_UINT16(_eseg->data() + ofs); - _narateFile = READ_LE_UINT16(_eseg->data() + idx); - _txtPages = READ_LE_UINT16(_eseg->data() + idx + 2); + int idx = READ_LE_UINT16(_establish->data() + ofs); + _narateFile = READ_LE_UINT16(_establish->data() + idx); + _txtPages = READ_LE_UINT16(_establish->data() + idx + 2); if (!_txtPages) return; - _sndSubFile = READ_LE_UINT16(_eseg->data() + idx + 4); + _sndSubFile = READ_LE_UINT16(_establish->data() + idx + 4); for (int i = 0; i < _txtPages; ++i) - _countTbl[i] = READ_LE_UINT16(_eseg->data() + idx + 6 + (2 * i)); + _countTbl[i] = READ_LE_UINT16(_establish->data() + idx + 6 + (2 * i)); } else { _establishGroup = 0; _narateFile = 0; _txtPages = 0; _sndSubFile = 0; - _eseg = _files->loadFile("ETEXT.DAT"); + _establish = _files->loadFile("ETEXT.DAT"); } } @@ -212,10 +212,10 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) { _screen->_printOrg = _screen->_printStart = Common::Point(48, 35); loadEstablish(estabIndex); _et = estabIndex; - uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (estabIndex * 2) + 2); + uint16 msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2); _printEnd = 155; - Common::String msg((const char *)_eseg->data() + msgOffset); + Common::String msg((const char *)_establish->data() + msgOffset); if (_txtPages == 0) { printText(_screen, msg); @@ -226,8 +226,8 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) { _screen->forceFadeOut(); _screen->clearScreen(); - delete _eseg; - _eseg = nullptr; + delete _establish; + _establish = nullptr; if (_establishMode == 0) _room->init4Quads(); @@ -550,10 +550,10 @@ void AmazonEngine::startChapter(int chapter) { _establishGroup = 1; loadEstablish(0x40 + _chapter); - uint16 msgOffset = READ_LE_UINT16(_eseg->data() + ((0x40 + _chapter) * 2) + 2); + uint16 msgOffset = READ_LE_UINT16(_establish->data() + ((0x40 + _chapter) * 2) + 2); _printEnd = 170; - Common::String msg((const char *)_eseg->data() + msgOffset); + Common::String msg((const char *)_establish->data() + msgOffset); if (_txtPages == 0) { printText(_screen, msg); |