[Scummvm-git-logs] scummvm master -> 1c4a964be5759d4a410acff0ae313ae023b6b929

dreammaster paulfgilbert at gmail.com
Sat May 9 03:04:56 UTC 2020


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:
1c4a964be5 ULTIMA4: Further context cleanup


Commit: 1c4a964be5759d4a410acff0ae313ae023b6b929
    https://github.com/scummvm/scummvm/commit/1c4a964be5759d4a410acff0ae313ae023b6b929
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T20:04:29-07:00

Commit Message:
ULTIMA4: Further context cleanup

Changed paths:
    engines/ultima/ultima4/game/context.cpp


diff --git a/engines/ultima/ultima4/game/context.cpp b/engines/ultima/ultima4/game/context.cpp
index 82e5477b4a..a2dc28b17d 100644
--- a/engines/ultima/ultima4/game/context.cpp
+++ b/engines/ultima/ultima4/game/context.cpp
@@ -38,15 +38,17 @@ Context::Context() : _stats(nullptr), _aura(nullptr),
 
 Context::~Context() {
 	g_context = nullptr;
-	delete _stats;
-	delete _aura;
+	reset();
 }
 
 void Context::reset() {
 	delete _stats;
 	delete _aura;
 	delete _party;
-	delete _location;
+
+	while (_location)
+		locationFree(&_location);
+
 	_stats = nullptr;
 	_aura = nullptr;
 	_party = nullptr;




More information about the Scummvm-git-logs mailing list