diff --git a/engines/grim/gfx_base.cpp b/engines/grim/gfx_base.cpp index 59a15043ce1..14bbe383466 100644 --- a/engines/grim/gfx_base.cpp +++ b/engines/grim/gfx_base.cpp @@ -46,7 +46,7 @@ namespace Grim { GfxBase::GfxBase() : _renderBitmaps(true), _renderZBitmaps(true), _shadowModeActive(false), _currentPos(0, 0, 0), _currentQuat(0, 0, 0, 1), _dimLevel(0.0f), - _screenWidth(0), _screenHeight(0), _screenSize(0), _isFullscreen(false), + _screenWidth(0), _screenHeight(0), _isFullscreen(false), _scaleW(1.0f), _scaleH(1.0f), _currentShadowArray(nullptr), _shadowColorR(255), _shadowColorG(255), _shadowColorB(255) { diff --git a/engines/grim/gfx_base.h b/engines/grim/gfx_base.h index 524580eab78..4ee0b9c7982 100644 --- a/engines/grim/gfx_base.h +++ b/engines/grim/gfx_base.h @@ -286,7 +286,7 @@ protected: static const int _gameHeight = 480; static const int _gameWidth = 640; float _scaleW, _scaleH; - int _screenWidth, _screenHeight, _screenSize; + int _screenWidth, _screenHeight; bool _isFullscreen; Shadow *_currentShadowArray; unsigned char _shadowColorR; diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp index 9c0d02826d5..7724e47f08c 100644 --- a/engines/grim/gfx_opengl.cpp +++ b/engines/grim/gfx_opengl.cpp @@ -145,9 +145,9 @@ byte *GfxOpenGL::setupScreen(int screenW, int screenH, bool fullscreen) { // Load emergency built-in font loadEmergFont(); - _screenSize = _screenWidth * _screenHeight * 4; - _storedDisplay = new byte[_screenSize]; - memset(_storedDisplay, 0, _screenSize); + int screenSize = _screenWidth * _screenHeight * 4; + _storedDisplay = new byte[screenSize]; + memset(_storedDisplay, 0, screenSize); _smushNumTex = 0; _currentShadowArray = nullptr; diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp index b4cd8c5fba2..7990b24e7e2 100644 --- a/engines/grim/gfx_opengl_shaders.cpp +++ b/engines/grim/gfx_opengl_shaders.cpp @@ -400,7 +400,6 @@ byte *GfxOpenGLS::setupScreen(int screenW, int screenH, bool fullscreen) { // Load emergency built-in font loadEmergFont(); - _screenSize = _screenWidth * _screenHeight * 4; glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); if (g_grim->getGameType() == GType_MONKEY4) { // GL_LEQUAL as glDepthFunc ensures that subsequent drawing attempts for diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp index 96bb70f4526..af2f43fd6d6 100644 --- a/engines/grim/gfx_tinygl.cpp +++ b/engines/grim/gfx_tinygl.cpp @@ -173,7 +173,6 @@ byte *GfxTinyGL::setupScreen(int screenW, int screenH, bool fullscreen) { _zb = new TinyGL::FrameBuffer(screenW, screenH, buf); TinyGL::glInit(_zb, 256); - _screenSize = _gameWidth * _gameHeight * _pixelFormat.bytesPerPixel; _storedDisplay.create(_pixelFormat, _gameWidth * _gameHeight, DisposeAfterUse::YES); _storedDisplay.clear(_gameWidth * _gameHeight);