aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/game_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2009-06-23 01:20:21 +0000
committerSven Hesse2009-06-23 01:20:21 +0000
commit8e63d7989f83877e63ee189693470eb2f61ecce5 (patch)
treecd216cbd2e489b7993f3e5c2e142876f7339dd46 /engines/gob/game_v2.cpp
parentec5b2d6c9ac7ef9370392f3a0c3e25b136dcb72b (diff)
downloadscummvm-rg350-8e63d7989f83877e63ee189693470eb2f61ecce5.tar.gz
scummvm-rg350-8e63d7989f83877e63ee189693470eb2f61ecce5.tar.bz2
scummvm-rg350-8e63d7989f83877e63ee189693470eb2f61ecce5.zip
Added Script::getTextsOffset()
svn-id: r41792
Diffstat (limited to 'engines/gob/game_v2.cpp')
-rw-r--r--engines/gob/game_v2.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index c1205f3bcd..4ad710d854 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -128,29 +128,25 @@ void Game_v2::playTot(int16 skipPlay) {
debugC(4, kDebugFileIO, "IMA: %s", _curImaFile);
debugC(4, kDebugFileIO, "EXT: %s", _curExtFile);
- filePtr = _script->getData() + 0x30;
-
_totTextData = 0;
totTextLoc = false;
- if (READ_LE_UINT32(filePtr) != (uint32) -1) {
+ if (_script->getTextsOffset() != ((uint32) -1)) {
_totTextData = new TotTextTable;
int32 size;
- if (READ_LE_UINT32(filePtr) == 0) {
+ if (_script->getTextsOffset() == 0) {
_totTextData->dataPtr = loadLocTexts(&size);
totTextLoc = true;
} else {
- _totTextData->dataPtr =
- (_script->getData() + READ_LE_UINT32(_script->getData() + 0x30));
- size = _script->getSize();
+ _totTextData->dataPtr = _script->getData() + _script->getTextsOffset();
+ size = _script->getSize() - _script->getTextsOffset();
_vm->_global->_language = _vm->_global->_languageWanted;
}
_totTextData->items = 0;
if (_totTextData->dataPtr != 0) {
- Common::MemoryReadStream totTextData(_totTextData->dataPtr,
- 4294967295U);
+ Common::MemoryReadStream totTextData(_totTextData->dataPtr, size);
_totTextData->itemsCount = totTextData.readSint16LE() & 0x3FFF;
_totTextData->items = new TotTextItem[_totTextData->itemsCount];