[Scummvm-git-logs] scummvm master -> 8609d799361100def04f260564a029a230980ccd

[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:
8609d79936 WINTERMUTE: WME3D: Restore modelX after load handle


Commit: 8609d799361100def04f260564a029a230980ccd
    https://github.com/scummvm/scummvm/commit/8609d799361100def04f260564a029a230980ccd
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-02T23:10:48+02:00

Commit Message:
WINTERMUTE: WME3D: Restore modelX after load handle

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


diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp
index c8a17c657ef..3fefac5c2b7 100644
--- a/engines/wintermute/base/saveload.cpp
+++ b/engines/wintermute/base/saveload.cpp
@@ -37,6 +37,10 @@
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/base/scriptables/script.h"
+#ifdef ENABLE_WME3D
+#include "engines/wintermute/base/gfx/x/modelx.h"
+#endif
+
 #include "common/savefile.h"
 #include "common/config-manager.h"
 
@@ -119,6 +123,9 @@ bool SaveLoad::initAfterLoad() {
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadSubFrame, "BaseSubFrame", nullptr);
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadSound,    "BaseSound",    nullptr);
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadFont,     "BaseFontTT",   nullptr);
+#ifdef ENABLE_WME3D
+	SystemClassRegistry::getInstance()->enumInstances(afterLoadModelX,   "ModelX",       nullptr);
+#endif
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadScript,   "ScScript",  nullptr);
 	// AdGame:
 	SystemClassRegistry::getInstance()->enumInstances(afterLoadScene,   "AdScene",   nullptr);
@@ -152,6 +159,13 @@ void SaveLoad::afterLoadFont(void *font, void *data) {
 	((BaseFont *)font)->afterLoad();
 }
 
+#ifdef ENABLE_WME3D
+//////////////////////////////////////////////////////////////////////////
+void SaveLoad::afterLoadModelX(void *model, void *data) {
+	((ModelX *)model)->initializeSimple();
+}
+#endif
+
 //////////////////////////////////////////////////////////////////////////
 void SaveLoad::afterLoadScript(void *script, void *data) {
 	((ScScript *)script)->afterLoad();
diff --git a/engines/wintermute/base/saveload.h b/engines/wintermute/base/saveload.h
index bbc0e597a78..6dca1978b09 100644
--- a/engines/wintermute/base/saveload.h
+++ b/engines/wintermute/base/saveload.h
@@ -49,6 +49,9 @@ private:
 	static void afterLoadSubFrame(void *subframe, void *data);
 	static void afterLoadSound(void *sound, void *data);
 	static void afterLoadFont(void *font, void *data);
+#ifdef ENABLE_WME3D
+	static void afterLoadModelX(void *model, void *data);
+#endif
 	static void afterLoadScript(void *script, void *data);
 };