diff --git a/engines/grim/emi/animationemi.cpp b/engines/grim/emi/animationemi.cpp index ae11b5cbc78..c1748beee77 100644 --- a/engines/grim/emi/animationemi.cpp +++ b/engines/grim/emi/animationemi.cpp @@ -99,7 +99,7 @@ Bone::~Bone() { } AnimationStateEmi::AnimationStateEmi(const Common::String &anim) : - _skel(nullptr), _looping(false), _active(false), + _skel(nullptr), _looping(false), _active(false), _paused(false), _fadeMode(Animation::None), _fade(1.0f), _fadeLength(0), _time(0), _startFade(1.0f), _boneJoints(nullptr) { _anim = g_resourceloader->getAnimationEmi(anim); diff --git a/engines/grim/inputdialog.cpp b/engines/grim/inputdialog.cpp index 7e96c5bb46e..7fc772f7f42 100644 --- a/engines/grim/inputdialog.cpp +++ b/engines/grim/inputdialog.cpp @@ -32,7 +32,8 @@ namespace Grim { InputDialog::InputDialog(const Common::String &message, const Common::String &string, bool hasTextField) : - GUI::Dialog(30, 20, 260, 124), _hasTextField(hasTextField) { + GUI::Dialog(30, 20, 260, 124), _hasTextField(hasTextField), + m_text(nullptr) { const int screenW = g_system->getOverlayWidth(); const int screenH = g_system->getOverlayHeight(); diff --git a/engines/grim/material.cpp b/engines/grim/material.cpp index 761140a228c..633a05a28dc 100644 --- a/engines/grim/material.cpp +++ b/engines/grim/material.cpp @@ -219,7 +219,7 @@ Material::Material(const Common::String &filename, Common::SeekableReadStream *d } Material::Material() : - Object(), _currImage(0), _data(nullptr) { + Object(), _currImage(0), _data(nullptr), _clampTexture(false) { } void Material::reload(CMap *cmap) { diff --git a/engines/grim/movie/codecs/smush_decoder.cpp b/engines/grim/movie/codecs/smush_decoder.cpp index 65080fbed71..16c9b88c582 100644 --- a/engines/grim/movie/codecs/smush_decoder.cpp +++ b/engines/grim/movie/codecs/smush_decoder.cpp @@ -476,6 +476,7 @@ SmushDecoder::SmushVideoTrack::SmushVideoTrack(int width, int height, int fps, i } SmushDecoder::SmushVideoTrack::~SmushVideoTrack() { + delete _codec48; delete _blocky8; delete _blocky16; _surface.free(); diff --git a/engines/grim/sector.cpp b/engines/grim/sector.cpp index c1cd506d77f..3b8d07de0a9 100644 --- a/engines/grim/sector.cpp +++ b/engines/grim/sector.cpp @@ -38,7 +38,8 @@ Sector::Sector() : } Sector::Sector(const Sector &other) : - _vertices(nullptr), _origVertices(nullptr), _sortplanes(nullptr) { + _vertices(nullptr), _origVertices(nullptr), _sortplanes(nullptr), + _numSortplanes(0) { *this = other; } diff --git a/engines/grim/set.cpp b/engines/grim/set.cpp index cc05f672230..9a57e747aa4 100644 --- a/engines/grim/set.cpp +++ b/engines/grim/set.cpp @@ -197,6 +197,8 @@ void Set::loadText(TextSplitter &ts) { void Set::loadBinary(Common::SeekableReadStream *data) { // yes, an array of size 0 _cmaps = nullptr;//new CMapPtr[0]; + _numCmaps = 0; + _numObjectStates = 0; _numSetups = data->readUint32LE(); diff --git a/graphics/opengles2/framebuffer.cpp b/graphics/opengles2/framebuffer.cpp index 0550e32402a..b5156696ea2 100644 --- a/graphics/opengles2/framebuffer.cpp +++ b/graphics/opengles2/framebuffer.cpp @@ -148,7 +148,7 @@ FrameBuffer::FrameBuffer(GLuint texture_name, uint width, uint height, uint text } FrameBuffer::~FrameBuffer() { - glDeleteRenderbuffers(2, &_renderBuffers[0]); + glDeleteRenderbuffers(2, _renderBuffers); glDeleteFramebuffers(1, &_frameBuffer); if (_managedTexture) glDeleteTextures(1, &_colorTexture); @@ -156,7 +156,7 @@ FrameBuffer::~FrameBuffer() { void FrameBuffer::init() { glGenFramebuffers(1, &_frameBuffer); - glGenRenderbuffers(2, &_renderBuffers[0]); + glGenRenderbuffers(2, _renderBuffers); glBindFramebuffer(GL_FRAMEBUFFER, _frameBuffer); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _colorTexture, 0);