[Scummvm-git-logs] scummvm master -> 84a563ab5a7292ae5dd6470db9d6200ab2d367b2

[dreammaster]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ea37ece4b0 ULTIMA4: Fix gcc warning
dda11dacce ULTIMA4: Further fixes for context memory leaks
84a563ab5a ULTIMA4: Minor music code cleanup


Commit: ea37ece4b0c2fcf34244e63753a18a243d5d63c7
    https://github.com/scummvm/scummvm/commit/ea37ece4b0c2fcf34244e63753a18a243d5d63c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T19:01:35-07:00

Commit Message:
ULTIMA4: Fix gcc warning

Changed paths:
    engines/ultima/ultima4/events/event_handler.cpp


diff --git a/engines/ultima/ultima4/events/event_handler.cpp b/engines/ultima/ultima4/events/event_handler.cpp
index 5f48b399af..830ffaea18 100644
--- a/engines/ultima/ultima4/events/event_handler.cpp
+++ b/engines/ultima/ultima4/events/event_handler.cpp
@@ -303,7 +303,7 @@ void EventHandler::handleKeyDownEvent(const Common::Event &event, Controller *co
 	bool processed;
 
 	key = (event.kbd.ascii != 0 && event.kbd.ascii < 128) ?
-		event.kbd.ascii : event.kbd.keycode;
+		event.kbd.ascii : (int)event.kbd.keycode;
 
 	key += (event.kbd.flags & (Common::KBD_CTRL |
 		Common::KBD_ALT | Common::KBD_META)) << 16;


Commit: dda11dacce60756b5cd85b9e76eb462e9c20f1ed
    https://github.com/scummvm/scummvm/commit/dda11dacce60756b5cd85b9e76eb462e9c20f1ed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T19:10:06-07:00

Commit Message:
ULTIMA4: Further fixes for context memory leaks

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 b90f99486b..82e5477b4a 100644
--- a/engines/ultima/ultima4/game/context.cpp
+++ b/engines/ultima/ultima4/game/context.cpp
@@ -21,14 +21,17 @@
  */
 
 #include "ultima/ultima4/game/context.h"
+#include "ultima/ultima4/game/player.h"
 #include "ultima/ultima4/views/stats.h"
+#include "ultima/ultima4/map/location.h"
 
 namespace Ultima {
 namespace Ultima4 {
 
 Context *g_context;
 
-Context::Context() : _stats(nullptr), _aura(nullptr) {
+Context::Context() : _stats(nullptr), _aura(nullptr),
+		_party(nullptr), _location(nullptr) {
 	g_context = this;
 	reset();
 }
@@ -42,11 +45,13 @@ Context::~Context() {
 void Context::reset() {
 	delete _stats;
 	delete _aura;
+	delete _party;
+	delete _location;
 	_stats = nullptr;
 	_aura = nullptr;
-
 	_party = nullptr;
 	_location = nullptr;
+
 	_lastShip = nullptr;
 	_line = _col = 0;
 	_moonPhase = 0;


Commit: 84a563ab5a7292ae5dd6470db9d6200ab2d367b2
    https://github.com/scummvm/scummvm/commit/84a563ab5a7292ae5dd6470db9d6200ab2d367b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T19:19:07-07:00

Commit Message:
ULTIMA4: Minor music code cleanup

Changed paths:
    engines/ultima/ultima4/sound/music.cpp


diff --git a/engines/ultima/ultima4/sound/music.cpp b/engines/ultima/ultima4/sound/music.cpp
index 17d1d68b0b..1104a6210d 100644
--- a/engines/ultima/ultima4/sound/music.cpp
+++ b/engines/ultima/ultima4/sound/music.cpp
@@ -103,7 +103,6 @@ void Music::playMapMusic() {
 
 void Music::playMusic(const Common::String &filename) {
 	stop();
-	Common::StackLock lock(_mutex);
 
 	// First try opening the file with whatever filename is provided
 	if (startMusic(filename))
@@ -170,7 +169,6 @@ bool Music::startMusic(const Common::String &filename) {
 }
 
 void Music::stop() {
-	Common::StackLock lock(_mutex);
 	_mixer->stopHandle(_soundHandle);
 	Audio::MidiPlayer::stop();
 }