From 9caed13d906b852cd90033a2df304d19f0f0e38c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 16:18:38 -0400
Subject: MADS: Better handling for removing sprite sets

---
 engines/mads/sprites.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 6488add86c..67d5e20fe5 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -402,10 +402,13 @@ void SpriteSets::remove(int idx) {
 	} else if (idx >= 0) {
 		delete (*this)[idx];
 
-		if (idx == ((int)size() - 1))
-			remove_at(size() - 1);
-		else
+		if (idx < ((int)size() - 1)) {
 			(*this)[idx] = nullptr;
+		} else {
+			do {
+				remove_at(size() - 1);
+			} while (size() > 0 && (*this)[size() - 1] == nullptr);
+		}
 	}
 }
 
-- 
cgit v1.2.3