diff options
| author | Travis Howell | 2006-04-11 00:42:19 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-11 00:42:19 +0000 |
| commit | 95993df8005dda7def72be087e37ea637636366b (patch) | |
| tree | 53906ddf0a659674de5c76cf6f800eb2584c0a17 /engines/simon | |
| parent | c17e46b1f1278bc11caafa2bec49d8f2609852fa (diff) | |
| download | scummvm-rg350-95993df8005dda7def72be087e37ea637636366b.tar.gz scummvm-rg350-95993df8005dda7def72be087e37ea637636366b.tar.bz2 scummvm-rg350-95993df8005dda7def72be087e37ea637636366b.zip | |
Ooops, re-enable code in allocBlock()
svn-id: r21776
Diffstat (limited to 'engines/simon')
| -rw-r--r-- | engines/simon/simon.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 12c17b90ce..02b3bebcf7 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -2150,20 +2150,20 @@ byte *SimonEngine::allocBlock(uint32 size) { blockEnd = block + size; - //if (blockEnd >= _vgaBufEnd) { - // _vgaBufFreeStart = _vgaBufStart; - //} else { - // _rejectBlock = false; - // checkNoOverWrite(blockEnd); - // if (_rejectBlock) - // continue; - // checkRunningAnims(blockEnd); - // if (_rejectBlock) - // continue; - // checkZonePtrs(blockEnd); + if (blockEnd >= _vgaBufEnd) { + _vgaBufFreeStart = _vgaBufStart; + } else { + _rejectBlock = false; + checkNoOverWrite(blockEnd); + if (_rejectBlock) + continue; + checkRunningAnims(blockEnd); + if (_rejectBlock) + continue; + checkZonePtrs(blockEnd); _vgaBufFreeStart = blockEnd; return block; - //} + } } } |