[Scummvm-cvs-logs] scummvm master -> 9dc2aabb62e7ea6584914031411e1f4a2dd38ccb

dreammaster dreammaster at scummvm.org
Wed Jun 4 04:28:18 CEST 2014


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:
72c9159043 MADS: Free the audio player when the game ends
9dc2aabb62 MADS: Remove redundant Palette::close method


Commit: 72c9159043984a4219e597f5c73576450021b7f2
    https://github.com/scummvm/scummvm/commit/72c9159043984a4219e597f5c73576450021b7f2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-03T22:27:05-04:00

Commit Message:
MADS: Free the audio player when the game ends

Changed paths:
    engines/mads/mads.cpp



diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 31e9b0d..59eec40 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -67,6 +67,7 @@ MADSEngine::~MADSEngine() {
 	delete _palette;
 	delete _resources;
 	delete _sound;
+	delete _audio;
 }
 
 void MADSEngine::initialize() {


Commit: 9dc2aabb62e7ea6584914031411e1f4a2dd38ccb
    https://github.com/scummvm/scummvm/commit/9dc2aabb62e7ea6584914031411e1f4a2dd38ccb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-03T22:27:33-04:00

Commit Message:
MADS: Remove redundant Palette::close method

Changed paths:
    engines/mads/game.cpp
    engines/mads/palette.h



diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index ea87a1f..b42408f 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -192,8 +192,6 @@ void Game::gameLoop() {
 		_vm->_events->freeCursors();
 		_vm->_sound->closeDriver();
 	}
-
-	_vm->_palette->close();
 }
 
 void Game::sectionLoop() {
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index ff93b2f..975167a 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -309,13 +309,6 @@ public:
 	 */
 	void setLowRange();
 
-	/**
-	 * Set up the palette as the game ends
-	 */
-	void close() {
-		warning("TODO: Palette::close");
-	}
-
 	void setColorFlags(byte r, byte g, byte b);
 	void setColorValues(byte r, byte g, byte b);
 






More information about the Scummvm-git-logs mailing list