PRINCE: blackPalette(), setPalette() update - allow game quit

scummvm · Jul 24, 2014 · 1f88852 · 1f88852
1 parent 9c9da0d
commit 1f88852
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/engines/prince/object.cpp b/engines/prince/object.cpp
@@ -43,7 +43,7 @@ Object::~Object() {
 		delete _surface;
 		_surface = nullptr;
 	}
-	if (_zoomSurface) {
+	if (_zoomSurface != nullptr) {
 		_zoomSurface->free();
 		delete _zoomSurface;
 		_zoomSurface = nullptr;

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
@@ -1779,6 +1779,14 @@ void PrinceEngine::blackPalette() {
 		fadeStep--;
 		_graph->setPalette(blackPalette);
 		_system->updateScreen();
+		Common::Event event;
+		Common::EventManager *eventMan = _system->getEventManager();
+		eventMan->pollEvent(event);
+		if (shouldQuit()) {
+			free(paletteBackup);
+			free(blackPalette);
+			return;
+		}
 		pause();
 	}
 	free(paletteBackup);
@@ -1800,6 +1808,14 @@ void PrinceEngine::setPalette() {
 		fadeStep++;
 		_graph->setPalette(blackPalette);
 		_system->updateScreen();
+		Common::Event event;
+		Common::EventManager *eventMan = _system->getEventManager();
+		eventMan->pollEvent(event);
+		if (shouldQuit()) {
+			_graph->setPalette(paletteBackup);
+			free(blackPalette);
+			return;
+		}
 		pause();
 	}
 	_graph->setPalette(paletteBackup);