From 4fddafa3e6ef1c250804ea6ce9baaf2a911027e8 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Mon, 9 Jun 2008 23:15:17 +0000
Subject: Implemented popAllCursors() in CursorManager to ensure that all
 unnecessary cursors are removed from the cursor stack when returning to the
 launcher

svn-id: r32642
---
 graphics/cursorman.cpp | 18 ++++++++++++++++++
 graphics/cursorman.h   |  8 ++++++++
 2 files changed, 26 insertions(+)

(limited to 'graphics')

diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index ba7c6dee9b..fe5f653b94 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -83,6 +83,24 @@ void CursorManager::popCursor() {
 	g_system->showMouse(isVisible());
 }
 
+
+void CursorManager::popAllCursors() {
+	while (!_cursorStack.empty()) {
+		Cursor *cur = _cursorStack.pop();
+		delete cur;
+	}
+
+	if (g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) {
+		while (!_cursorPaletteStack.empty()) {
+			Palette *pal = _cursorPaletteStack.pop();
+			delete pal;
+		}
+	}
+
+	g_system->showMouse(isVisible());
+}
+
+
 void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int targetScale) {
 	if (_cursorStack.empty()) {
 		pushCursor(buf, w, h, hotspotX, hotspotY, keycolor, targetScale);
diff --git a/graphics/cursorman.h b/graphics/cursorman.h
index 151038e118..bf05ab762b 100644
--- a/graphics/cursorman.h
+++ b/graphics/cursorman.h
@@ -79,6 +79,14 @@ public:
 	 */
 	void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1);
 
+	/**
+	 * Pop all of the cursors and cursor palettes from their respective stacks.
+	 * The purpose is to ensure that all unecessary cursors are removed from the 
+	 * stack when returning to the launcher from an engine.
+	 *
+	 */
+	void popAllCursors();
+
 	/**
 	 * Enable/Disable the current cursor palette.
 	 *
-- 
cgit v1.2.3