diff options
author | Peter Kohaut | 2019-02-12 23:04:00 +0100 |
---|---|---|
committer | Peter Kohaut | 2019-02-12 23:07:14 +0100 |
commit | d8eb3c14a488fb7b678aab926de1a0d46ead8a46 (patch) | |
tree | 95b318f8597c8570eaad12481b805817fb4690d1 /engines/bladerunner/zbuffer.cpp | |
parent | 37e083dcafd4e1243271760974f3671d8a537cf9 (diff) | |
download | scummvm-rg350-d8eb3c14a488fb7b678aab926de1a0d46ead8a46.tar.gz scummvm-rg350-d8eb3c14a488fb7b678aab926de1a0d46ead8a46.tar.bz2 scummvm-rg350-d8eb3c14a488fb7b678aab926de1a0d46ead8a46.zip |
BLADERUNNER: Removal of memory leaks
Diffstat (limited to 'engines/bladerunner/zbuffer.cpp')
-rw-r--r-- | engines/bladerunner/zbuffer.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/engines/bladerunner/zbuffer.cpp b/engines/bladerunner/zbuffer.cpp index 044992670b..21fa6c5da1 100644 --- a/engines/bladerunner/zbuffer.cpp +++ b/engines/bladerunner/zbuffer.cpp @@ -24,6 +24,8 @@ #include "bladerunner/decompress_lzo.h" +#include "common/debug.h" + namespace BladeRunner { void ZBufferDirtyRects::reset() { @@ -70,13 +72,18 @@ bool ZBufferDirtyRects::popRect(Common::Rect *rect) { } ZBuffer::ZBuffer() { - reset(); + _zbuf1 = nullptr; + _zbuf2 = nullptr; + _dirtyRects = new ZBufferDirtyRects(); + _width = 0; + _height = 0; + enable(); } ZBuffer::~ZBuffer() { - delete _dirtyRects; - delete[] _zbuf1; delete[] _zbuf2; + delete[] _zbuf1; + delete _dirtyRects; } void ZBuffer::init(int width, int height) { @@ -85,8 +92,6 @@ void ZBuffer::init(int width, int height) { _zbuf1 = new uint16[width * height]; _zbuf2 = new uint16[width * height]; - - _dirtyRects = new ZBufferDirtyRects(); } static int decodePartialZBuffer(const uint8 *src, uint16 *curZBUF, uint32 srcLen) { @@ -167,22 +172,13 @@ uint16 ZBuffer::getZValue(int x, int y) const { assert(x >= 0 && x < _width); assert(y >= 0 && y < _height); - if (!_zbuf2) { + if (_zbuf2 == nullptr) { return 0; } return _zbuf2[y * _width + x]; } -void ZBuffer::reset() { - _zbuf1 = nullptr; - _zbuf2 = nullptr; - _dirtyRects = nullptr; - _width = 0; - _height = 0; - enable(); -} - void ZBuffer::blit(Common::Rect rect) { int line_width = rect.width(); |