diff options
| author | Strangerke | 2014-06-25 19:37:25 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-25 19:37:25 +0200 |
| commit | 00c867f8ea983cc2194a0bf2208d48511605d685 (patch) | |
| tree | 91dbde04d48a6f1daa30b549b33ee6f1cc994b20 /engines/cge2/vga13h.cpp | |
| parent | 384f1b664bc10c18a1501093b80fa4d6ca146475 (diff) | |
| download | scummvm-rg350-00c867f8ea983cc2194a0bf2208d48511605d685.tar.gz scummvm-rg350-00c867f8ea983cc2194a0bf2208d48511605d685.tar.bz2 scummvm-rg350-00c867f8ea983cc2194a0bf2208d48511605d685.zip | |
CGE2: Add a safeguard in Sprite::show()
Diffstat (limited to 'engines/cge2/vga13h.cpp')
| -rw-r--r-- | engines/cge2/vga13h.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp index 2c8a3a6801..9507ade704 100644 --- a/engines/cge2/vga13h.cpp +++ b/engines/cge2/vga13h.cpp @@ -612,6 +612,7 @@ void Sprite::show() { } void Sprite::show(uint16 pg) { + assert(pg < 4); Graphics::Surface *a = _vm->_vga->_page[1]; _vm->_vga->_page[1] = _vm->_vga->_page[pg]; getShp()->show(_pos2D); @@ -802,8 +803,8 @@ Sprite *Queue::remove(Sprite *spr) { spr->_next->_prev = spr->_prev; if (spr->_prev) spr->_prev->_next = spr->_next; - spr->_prev = NULL; - spr->_next = NULL; + spr->_prev = nullptr; + spr->_next = nullptr; return spr; } |