From 00c867f8ea983cc2194a0bf2208d48511605d685 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 25 Jun 2014 19:37:25 +0200
Subject: CGE2: Add a safeguard in Sprite::show()

---
 engines/cge2/vga13h.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/cge2/vga13h.cpp')

diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 2c8a3a6801..9507ade704 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -612,6 +612,7 @@ void Sprite::show() {
 }
 
 void Sprite::show(uint16 pg) {
+	assert(pg < 4);
 	Graphics::Surface *a = _vm->_vga->_page[1];
 	_vm->_vga->_page[1] = _vm->_vga->_page[pg];
 	getShp()->show(_pos2D);
@@ -802,8 +803,8 @@ Sprite *Queue::remove(Sprite *spr) {
 		spr->_next->_prev = spr->_prev;
 	if (spr->_prev)
 		spr->_prev->_next = spr->_next;
-	spr->_prev = NULL;
-	spr->_next = NULL;
+	spr->_prev = nullptr;
+	spr->_next = nullptr;
 	return spr;
 }
 
-- 
cgit v1.2.3