[Scummvm-git-logs] scummvm master -> 24ab85c304aeed6d44edb6883be52ace9387341b

[mduggan]

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:
24ab85c304 ULTIMA8: Clear mover process pointer before reset


Commit: 24ab85c304aeed6d44edb6883be52ace9387341b
    https://github.com/scummvm/scummvm/commit/24ab85c304aeed6d44edb6883be52ace9387341b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-02-20T11:00:10+11:00

Commit Message:
ULTIMA8: Clear mover process pointer before reset

Avoid the possibility of referencing this process during/after kernel reset
(eg, when starting a new game)

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 674d6031c27..480e6caffe1 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -341,6 +341,9 @@ void Ultima8Engine::deinitialize() {
 	delete _ucMachine;
 	_ucMachine = nullptr;
 
+	// This process will be cleared in kernel reset.
+	_avatarMoverProcess = nullptr;
+
 	_kernel->reset();
 	_paletteManager->reset();
 	_fontManager->resetGameFonts();
@@ -1060,6 +1063,10 @@ void Ultima8Engine::resetEngine() {
 	// now, reset everything (order matters)
 	_world->reset();
 	_ucMachine->reset();
+
+	// This process will be cleared by kernel reset.
+	_avatarMoverProcess = nullptr;
+
 	// ObjectManager, Kernel have to be last, because they kill
 	// all processes/objects
 	_objectManager->reset();