diff options
| author | Filippos Karapetis | 2010-06-18 15:40:18 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-18 15:40:18 +0000 |
| commit | 680f7c897af5dac091e1abc47f0500cccbd07a51 (patch) | |
| tree | 62e8056d2af6c50aa7812d88f8e42776265a8aaa /engines/sci/engine/seg_manager.cpp | |
| parent | 5d378574a438f7b7f60fd01b88dd58e05c0bcd9b (diff) | |
| download | scummvm-rg350-680f7c897af5dac091e1abc47f0500cccbd07a51.tar.gz scummvm-rg350-680f7c897af5dac091e1abc47f0500cccbd07a51.tar.bz2 scummvm-rg350-680f7c897af5dac091e1abc47f0500cccbd07a51.zip | |
Fixed a problem in kAnimate which occurred when a list was modified by a call (e.g. in KQ1 demo, PQ2)
svn-id: r50022
Diffstat (limited to 'engines/sci/engine/seg_manager.cpp')
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index f19c03d5a8..5371238304 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -531,12 +531,6 @@ Node *SegManager::lookupNode(reg_t addr) { SegmentType type = getSegmentType(addr.segment); if (type != SEG_TYPE_NODES) { - if (g_sci->getGameId() == "kq1sci") { - // WORKAROUND: The demo of KQ1 is trying to use an invalid memory reference as a list node - warning("Attempt to use non-node %04x:%04x (type %d) as list node", PRINT_REG(addr), type); - return NULL; - } - error("Attempt to use non-node %04x:%04x (type %d) as list node", PRINT_REG(addr), type); return NULL; } @@ -544,7 +538,7 @@ Node *SegManager::lookupNode(reg_t addr) { NodeTable *nt = (NodeTable *)_heap[addr.segment]; if (!nt->isValidEntry(addr.offset)) { - error("Attempt to use invalid reference %04x:%04x as list node", PRINT_REG(addr)); + error("Attempt to use invalid or discarded reference %04x:%04x as list node", PRINT_REG(addr)); return NULL; } |