[Scummvm-git-logs] scummvm master -> 5426f8e062bcbf001c1e494ece7bdd04bb8d48f4

[aquadran]

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:
5426f8e062 WINTERMUTE: Fixed compilation when disabled 3D


Commit: 5426f8e062bcbf001c1e494ece7bdd04bb8d48f4
    https://github.com/scummvm/scummvm/commit/5426f8e062bcbf001c1e494ece7bdd04bb8d48f4
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-17T15:14:32+01:00

Commit Message:
WINTERMUTE: Fixed compilation when disabled 3D

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


diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index b6a441cf00a..28cb800e40b 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -823,7 +823,6 @@ bool BasePersistenceManager::transferVector2(const char *name, Vector2 *val) {
 	}
 }
 
-#ifdef ENABLE_WME3D
 //////////////////////////////////////////////////////////////////////////
 // Vector3
 bool BasePersistenceManager::transferVector3d(const char *name, DXVector3 *val) {
@@ -921,7 +920,6 @@ bool BasePersistenceManager::transferAngle(const char *name, float *val) {
 
 	return STATUS_OK;
 }
-#endif
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index abea8bad3d0..a296fe0dd0e 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -98,12 +98,10 @@ public:
 	bool transferCharPtr(const char *name, char **val);
 	bool transferString(const char *name, Common::String *val);
 	bool transferVector2(const char *name, Vector2 *val);
-#ifdef ENABLE_WME3D
 	bool transferVector3d(const char *name, DXVector3 *val);
 	bool transferVector4d(const char *name, DXVector4 *val);
 	bool transferMatrix4(const char *name, DXMatrix *val);
 	bool transferAngle(const char *name, float *val);
-#endif
 	BasePersistenceManager(const Common::String &savePrefix = "", bool deleteSingleton = false);
 	virtual ~BasePersistenceManager();
 	bool checkVersion(byte  verMajor, byte verMinor, byte verBuild);
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 25b6eb733c8..d9fefae3fe5 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -57,6 +57,7 @@ MODULE_OBJS := \
 	base/gfx/osystem/base_surface_osystem.o \
 	base/gfx/osystem/base_render_osystem.o \
 	base/gfx/osystem/render_ticket.o \
+	base/gfx/xmath.o \
 	base/particles/part_particle.o \
 	base/particles/part_emitter.o \
 	base/particles/part_force.o \
@@ -183,7 +184,6 @@ MODULE_OBJS += \
 	base/gfx/xfile_loader.o \
 	base/gfx/xframe_node.o \
 	base/gfx/xmaterial.o \
-	base/gfx/xmath.o \
 	base/gfx/xmesh.o \
 	base/gfx/xmodel.o \
 	base/gfx/xskinmesh.o \