[Scummvm-git-logs] scummvm master -> 2ced43fc9eff674f3263e862da051e6f5bb6760a

dreammaster paulfgilbert at gmail.com
Sat May 9 03:21:13 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:
2ced43fc9e ULTIMA4: Further leak fixes


Commit: 2ced43fc9eff674f3263e862da051e6f5bb6760a
    https://github.com/scummvm/scummvm/commit/2ced43fc9eff674f3263e862da051e6f5bb6760a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T20:20:58-07:00

Commit Message:
ULTIMA4: Further leak fixes

Changed paths:
    engines/ultima/ultima4/game/player.cpp
    engines/ultima/ultima4/map/tile.cpp
    engines/ultima/ultima4/map/tile.h


diff --git a/engines/ultima/ultima4/game/player.cpp b/engines/ultima/ultima4/game/player.cpp
index 2b30cee72f..6476cdce0f 100644
--- a/engines/ultima/ultima4/game/player.cpp
+++ b/engines/ultima/ultima4/game/player.cpp
@@ -562,6 +562,8 @@ Party::Party(SaveGame *s) : _saveGame(s), _transport(0), _torchDuration(0), _act
 }
 
 Party::~Party() {
+	for (uint idx = 0; idx < _members.size(); ++idx)
+		delete _members[idx];
 }
 
 void Party::notifyOfChange(PartyMember *pm, PartyEvent::Type eventType) {
diff --git a/engines/ultima/ultima4/map/tile.cpp b/engines/ultima/ultima4/map/tile.cpp
index 135ab7bde3..d6216637ac 100644
--- a/engines/ultima/ultima4/map/tile.cpp
+++ b/engines/ultima/ultima4/map/tile.cpp
@@ -60,6 +60,10 @@ Tile::Tile(Tileset *tileset)
 	, _animationRule("") {
 }
 
+Tile::~Tile() {
+	deleteImage();
+}
+
 void Tile::loadProperties(const ConfigElement &conf) {
 	if (conf.getName() != "tile")
 		return;
diff --git a/engines/ultima/ultima4/map/tile.h b/engines/ultima/ultima4/map/tile.h
index 8706b46361..adc89af77c 100644
--- a/engines/ultima/ultima4/map/tile.h
+++ b/engines/ultima/ultima4/map/tile.h
@@ -66,6 +66,7 @@ class TileAnim;
 class Tile : private Uncopyable {
 public:
 	Tile(Tileset *tileset);
+	~Tile();
 
 	/**
 	 * Loads tile information.




More information about the Scummvm-git-logs mailing list