[Scummvm-git-logs] scummvm master -> 601686032083a609c26ad4457df778be9dc12a43

[aquadran]

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

Summary:
6016860320 WINTERMUTE: Cleanup


Commit: 601686032083a609c26ad4457df778be9dc12a43
    https://github.com/scummvm/scummvm/commit/601686032083a609c26ad4457df778be9dc12a43
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-14T11:31:02+02:00

Commit Message:
WINTERMUTE: Cleanup

Changed paths:
    engines/wintermute/base/base_persistence_manager.h
    engines/wintermute/wintermute.cpp


diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 6b1411e2c6c..fb422e5550a 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -37,20 +37,8 @@
 #include "common/system.h"
 #include "common/rect.h"
 
-#ifdef ENABLE_WME3D
-namespace Math {
-
-class Angle;
-template<int rows, int cols> class Matrix;
-typedef Matrix<4, 4> Matrix4;
-typedef Matrix<3, 1> Vector3d;
-
-} // namespace Math
-#endif
-
 namespace Wintermute {
 
-class Vector2;
 class BaseGame;
 class BasePersistenceManager {
 public:
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 51cb4a4d3ee..d2c7db54957 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -145,8 +145,6 @@ int WintermuteEngine::init() {
 		if (!(instance.getFlags() & GF_LOWSPEC_ASSETS)) {
 			GUI::MessageDialog dialog(_("This game requires PNG, JPEG and Vorbis support."));
 			dialog.runModal();
-			delete _game;
-			_game = nullptr;
 			return false;
 		}
 	#endif
@@ -156,8 +154,6 @@ int WintermuteEngine::init() {
 		if (BaseEngine::isFoxTailCheck(instance.getTargetExecutable())) {
 			GUI::MessageDialog dialog(_("This game requires the FoxTail subengine, which is not compiled in."));
 			dialog.runModal();
-			delete _game;
-			_game = nullptr;
 			return false;
 		}
 	#endif
@@ -167,8 +163,6 @@ int WintermuteEngine::init() {
 		if (instance.getTargetExecutable() == WME_HEROCRAFT) {
 			GUI::MessageDialog dialog(_("This game requires the HeroCraft subengine, which is not compiled in."));
 			dialog.runModal();
-			delete _game;
-			_game = nullptr;
 			return false;
 		}
 	#endif
@@ -179,8 +173,6 @@ int WintermuteEngine::init() {
 		GUI::MessageDialog dialog(_("This game requires 3D capabilities, which is not compiled in. As such, it"
 			" is likely to be unplayable totally or partially."), _("Start anyway"), _("Cancel"));
 		if (dialog.runModal() != GUI::kMessageOK) {
-			delete _game;
-			_game = nullptr;
 			return 1;
 		}
 	}