[Scummvm-git-logs] scummvm master -> 353947c86457d657d8955b0c3927362e9328be19

[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:
353947c864 WINTERMUTE: Sync with original, remove code


Commit: 353947c86457d657d8955b0c3927362e9328be19
    https://github.com/scummvm/scummvm/commit/353947c86457d657d8955b0c3927362e9328be19
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-13T11:19:10+02:00

Commit Message:
WINTERMUTE: Sync with original, remove code

Changed paths:
    engines/wintermute/base/gfx/xmodel.cpp
    engines/wintermute/base/saveload.cpp


diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index 19a4ba8ab40..b07593135d8 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -926,9 +926,6 @@ bool XModel::persist(BasePersistenceManager *persistMgr) {
 		}
 	}
 
-	if (!persistMgr->getIsSaving())
-		initializeSimple();
-
 	return true;
 }
 
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp
index e88dc9a0507..f1083bf7f22 100644
--- a/engines/wintermute/base/saveload.cpp
+++ b/engines/wintermute/base/saveload.cpp
@@ -126,9 +126,9 @@ bool SaveLoad::initAfterLoad() {
 #ifdef ENABLE_WME3D
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadXModel,   "XModel",       nullptr);
 #endif
-	SystemClassRegistry::getInstance()->enumInstances(afterLoadScript,   "ScScript",  nullptr);
+	SystemClassRegistry::getInstance()->enumInstances(afterLoadScript,   "ScScript",     nullptr);
 	// AdGame:
-	SystemClassRegistry::getInstance()->enumInstances(afterLoadScene,   "AdScene",   nullptr);
+	SystemClassRegistry::getInstance()->enumInstances(afterLoadScene,    "AdScene",      nullptr);
 	return STATUS_OK;
 }