diff options
| author | Colin Snover | 2016-07-29 15:48:14 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-01 10:37:14 -0500 |
| commit | 2071196f4235c75ff020605f53b3d397532e841a (patch) | |
| tree | aaae025e3e221e29e7d0c2f2b9c48f4e760caf6e /engines/sci/engine/gc.cpp | |
| parent | 4e31c9aaf4aa36b6fea039d1779317e6a943e68b (diff) | |
| download | scummvm-rg350-2071196f4235c75ff020605f53b3d397532e841a.tar.gz scummvm-rg350-2071196f4235c75ff020605f53b3d397532e841a.tar.bz2 scummvm-rg350-2071196f4235c75ff020605f53b3d397532e841a.zip | |
SCI32: Add bitmap segment and remove GC option from hunk segment
Diffstat (limited to 'engines/sci/engine/gc.cpp')
| -rw-r--r-- | engines/sci/engine/gc.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index e0467e9461..ad4fd19405 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -154,16 +154,18 @@ AddrSet *findAllActiveReferences(EngineState *s) { } } - // Init: Explicitly opted-out hunks - else if (heap[i]->getType() == SEG_TYPE_HUNK) { - HunkTable *ht = static_cast<HunkTable *>(heap[i]); +#ifdef ENABLE_SCI32 + // Init: Explicitly opted-out bitmaps + else if (heap[i]->getType() == SEG_TYPE_BITMAP) { + BitmapTable *bt = static_cast<BitmapTable *>(heap[i]); - for (uint j = 0; j < ht->_table.size(); j++) { - if (!ht->_table[j].data.gc) { + for (uint j = 0; j < bt->_table.size(); j++) { + if (!bt->_table[j].data.getShouldGC()) { wm.push(make_reg(i, j)); } } } +#endif } } |