thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Make Script::_exportTable const (yay :-)

Browse source 
svn-id: r49315
This commit is contained in:
Max Horn 2010-05-29 21:42:42 +00:00
parent 5143e7fff4
commit 42d6ed880b
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/console.cpp
View file

@ -1247,7 +1247,7 @@ bool Console::segmentInfo(int nr) {
Script *scr = (Script *)mobj; Script *scr = (Script *)mobj;
DebugPrintf("script.%03d locked by %d, bufsize=%d (%x)\n", scr->_nr, scr->getLockers(), (uint)scr->_bufSize, (uint)scr->_bufSize); DebugPrintf("script.%03d locked by %d, bufsize=%d (%x)\n", scr->_nr, scr->getLockers(), (uint)scr->_bufSize, (uint)scr->_bufSize);
if (scr->_exportTable) if (scr->_exportTable)
DebugPrintf(" Exports: %4d at %d\n", scr->_numExports, (int)(((byte *)scr->_exportTable) - ((byte *)scr->_buf))); DebugPrintf(" Exports: %4d at %d\n", scr->_numExports, (int)(((const byte *)scr->_exportTable) - ((const byte *)scr->_buf)));
else else
DebugPrintf(" Exports: none\n"); DebugPrintf(" Exports: none\n");

2
engines/sci/engine/savegame.cpp
View file

@ -800,7 +800,7 @@ void SegManager::reconstructScripts(EngineState *s) {
scr->setExportTableOffset(6); scr->setExportTableOffset(6);
} }
} else { } else {
scr->_exportTable = (uint16 *) scr->findBlock(SCI_OBJ_EXPORTS); scr->_exportTable = (const uint16 *)scr->findBlock(SCI_OBJ_EXPORTS);
scr->_synonyms = scr->findBlock(SCI_OBJ_SYNONYMS); scr->_synonyms = scr->findBlock(SCI_OBJ_SYNONYMS);
scr->_exportTable += 3; scr->_exportTable += 3;
} }

2
engines/sci/engine/segment.cpp
View file

@ -362,7 +362,7 @@ void Script::setLockers(int lockers) {
void Script::setExportTableOffset(int offset) { void Script::setExportTableOffset(int offset) {
if (offset) { if (offset) {
_exportTable = (uint16 *)(_buf + offset + 2); _exportTable = (const uint16 *)(_buf + offset + 2);
_numExports = READ_SCI11ENDIAN_UINT16(_exportTable - 1); _numExports = READ_SCI11ENDIAN_UINT16(_exportTable - 1);
} else { } else {
_exportTable = NULL; _exportTable = NULL;

2
engines/sci/engine/segment.h
View file

@ -329,7 +329,7 @@ public:
byte *_heapStart; /**< Start of heap if SCI1.1, NULL otherwise */ byte *_heapStart; /**< Start of heap if SCI1.1, NULL otherwise */
uint16 *_exportTable; /**< Abs. offset of the export table or 0 if not present */ const uint16 *_exportTable; /**< Abs. offset of the export table or 0 if not present */
int _numExports; /**< Number of entries in the exports table */ int _numExports; /**< Number of entries in the exports table */
const byte *_synonyms; /**< Synonyms block or 0 if not present*/ const byte *_synonyms; /**< Synonyms block or 0 if not present*/