[Scummvm-git-logs] scummvm master -> 3cfb5bcdc534305a8e5d1b8bbd241e88eac83833

yinsimei roseline.yin at gmail.com
Sat Aug 12 16:51:40 CEST 2017


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

Summary:
606d2135b8 SLUDGE: Fix SoundManager destructure error
3cfb5bcdc5 SLUDGE: Fix unmatched delete and delete []


Commit: 606d2135b85a15820fb8a95d3d7d91adfae76b24
    https://github.com/scummvm/scummvm/commit/606d2135b85a15820fb8a95d3d7d91adfae76b24
Author: Simei Yin (roseline.yin at gmail.com)
Date: 2017-08-12T16:49:47+02:00

Commit Message:
SLUDGE: Fix SoundManager destructure error

Changed paths:
    engines/sludge/sound.cpp


diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index f25b48f..79b9ab7 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -65,6 +65,8 @@ SoundManager::SoundManager() {
 }
 
 SoundManager::~SoundManager() {
+	killSoundStuff();
+
 	delete []_soundCache;
 	_soundCache = nullptr;
 
@@ -72,8 +74,6 @@ SoundManager::~SoundManager() {
 	delete []_modCache;
 	_modCache = nullptr;
 	#endif
-
-	killSoundStuff();
 }
 
 bool SoundManager::initSoundStuff() {


Commit: 3cfb5bcdc534305a8e5d1b8bbd241e88eac83833
    https://github.com/scummvm/scummvm/commit/3cfb5bcdc534305a8e5d1b8bbd241e88eac83833
Author: Simei Yin (roseline.yin at gmail.com)
Date: 2017-08-12T16:49:47+02:00

Commit Message:
SLUDGE: Fix unmatched delete and delete []

Changed paths:
    engines/sludge/floor.cpp


diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index 1884b44..dff6980 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -107,13 +107,13 @@ bool initFloor() {
 void killFloor() {
 	for (int i = 0; i < currentFloor->numPolygons; i++) {
 		delete []currentFloor->polygon[i].vertexID;
-		delete currentFloor->matrix[i];
+		delete []currentFloor->matrix[i];
 	}
-	delete currentFloor->polygon;
+	delete []currentFloor->polygon;
 	currentFloor->polygon = NULL;
-	delete currentFloor->vertex;
+	delete []currentFloor->vertex;
 	currentFloor->vertex = NULL;
-	delete currentFloor->matrix;
+	delete []currentFloor->matrix;
 	currentFloor->matrix = NULL;
 }
 





More information about the Scummvm-git-logs mailing list