[Scummvm-git-logs] scummvm master -> d9efcde6134dc088a76d963c96fae247a7716fae

[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:
d9efcde613 WINTERMUTE: Cleanup class BaseNamedObject


Commit: d9efcde6134dc088a76d963c96fae247a7716fae
    https://github.com/scummvm/scummvm/commit/d9efcde6134dc088a76d963c96fae247a7716fae
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-08-28T13:24:40+02:00

Commit Message:
WINTERMUTE: Cleanup class BaseNamedObject

Changed paths:
    engines/wintermute/base/base_named_object.h


diff --git a/engines/wintermute/base/base_named_object.h b/engines/wintermute/base/base_named_object.h
index e9e8b174db8..669bea5e346 100644
--- a/engines/wintermute/base/base_named_object.h
+++ b/engines/wintermute/base/base_named_object.h
@@ -34,23 +34,14 @@
 namespace Wintermute {
 
 class BaseNamedObject : public BaseClass {
-#ifndef ENABLE_WME3D
-	char *_name;
-#endif
 public:
+	char *_name;
+
 	BaseNamedObject(BaseGame *inGame);
 	BaseNamedObject();
-	~BaseNamedObject(void) override;
+	~BaseNamedObject() override;
 	BaseNamedObject(TDynamicConstructor, TDynamicConstructor);
 
-#ifdef ENABLE_WME3D
-	// making this public is a quick hack for loading/saving the name variable
-	// via the persistence manager in the AdSceneGeometry class
-	// we could make this class here persistable as well,
-	// but the relevant subclasses don't persist their bases at the moment
-	char *_name;
-#endif
-
 	const char *getName() const { return _name; }
 	void setName(const char *name);
 };