[Scummvm-git-logs] scummvm master -> 088f97558a3a77dcc76b5b7049a76ff9fb0e8b3e

aquadran noreply at scummvm.org
Sat Jul 2 21:16:32 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
088f97558a WINTERMUTE: WME3D: Added missing guards without wme3d


Commit: 088f97558a3a77dcc76b5b7049a76ff9fb0e8b3e
    https://github.com/scummvm/scummvm/commit/088f97558a3a77dcc76b5b7049a76ff9fb0e8b3e
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-02T23:16:28+02:00

Commit Message:
WINTERMUTE: WME3D: Added missing guards without wme3d

Changed paths:
    engines/wintermute/base/base_game.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 7aa40329ec0..d62e6128b9a 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -358,10 +358,12 @@ bool BaseGame::cleanup() {
 	_fontStorage->removeFont(_videoFont);
 	_videoFont = nullptr;
 
+#ifdef ENABLE_WME3D
 	if (_shadowImage) {
 		_surfaceStorage->removeSurface(_shadowImage);
 		_shadowImage = nullptr;
 	}
+#endif
 
 	for (uint32 i = 0; i < _quickMessages.size(); i++) {
 		delete _quickMessages[i];
@@ -1055,9 +1057,11 @@ bool BaseGame::loadBuffer(char *buffer, bool complete) {
 	if (!_systemFont) {
 		_systemFont = _gameRef->_fontStorage->addFont("system_font.fnt");
 	}
+#ifdef ENABLE_WME3D
 	if (!_shadowImage) {
 		_shadowImage = _gameRef->_surfaceStorage->addSurface("shadow.png");
 	}
+#endif
 
 	if (cmd == PARSERR_TOKENNOTFOUND) {
 		_gameRef->LOG(0, "Syntax error in GAME definition");




More information about the Scummvm-git-logs mailing list