[Scummvm-git-logs] scummvm master -> 075991464d9a6fb5bd1c9aeeb2402226adfba0c1
aquadran
noreply at scummvm.org
Sun Aug 10 15:53:57 UTC 2025
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:
075991464d WINTERMUTE: Cleanup
Commit: 075991464d9a6fb5bd1c9aeeb2402226adfba0c1
https://github.com/scummvm/scummvm/commit/075991464d9a6fb5bd1c9aeeb2402226adfba0c1
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-08-10T17:53:51+02:00
Commit Message:
WINTERMUTE: Cleanup
Changed paths:
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/base/base_object.cpp
engines/wintermute/base/base_persistence_manager.cpp
engines/wintermute/base/base_persistence_manager.h
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index a8824fb02b0..a7e4738958d 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -2281,7 +2281,7 @@ bool AdActor3DX::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER(_path3D));
persistMgr->transferPtr(TMEMBER(_path2D));
- persistMgr->transferAngle(TMEMBER(_targetAngle));
+ persistMgr->transferFloat(TMEMBER(_targetAngle));
persistMgr->transferVector3d(TMEMBER(_targetPoint3D));
persistMgr->transferPtr(TMEMBER(_targetPoint2D));
persistMgr->transferBool(TMEMBER(_turningLeft));
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index f697679c1f4..a3588af5450 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -1108,7 +1108,7 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
#ifdef ENABLE_WME3D
if (BaseEngine::instance().getFlags() & GF_3D) {
- persistMgr->transferAngle(TMEMBER(_angle));
+ persistMgr->transferFloat(TMEMBER(_angle));
persistMgr->transferPtr(TMEMBER(_xmodel));
persistMgr->transferPtr(TMEMBER(_shadowModel));
persistMgr->transferVector3d(TMEMBER(_posVector));
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index d9be0d50162..33dc17ea7ce 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -915,25 +915,6 @@ bool BasePersistenceManager::transferMatrix4(const char *name, DXMatrix *val) {
}
}
-bool BasePersistenceManager::transferAngle(const char *name, float *val) {
- if (_saving) {
- putFloat(*val);
-
- if (_saveStream->err()) {
- return STATUS_FAILED;
- }
- } else {
- *val = getFloat();
-
- if (_loadStream->err()) {
- return STATUS_FAILED;
- }
- }
-
- return STATUS_OK;
-}
-
-
//////////////////////////////////////////////////////////////////////////
// generic pointer
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index a296fe0dd0e..23e3e559589 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -101,7 +101,6 @@ public:
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);
BasePersistenceManager(const Common::String &savePrefix = "", bool deleteSingleton = false);
virtual ~BasePersistenceManager();
bool checkVersion(byte verMajor, byte verMinor, byte verBuild);
More information about the Scummvm-git-logs
mailing list