From a8008e0a717fd2bb1d697f04c1901397deabe958 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Tue, 31 Jan 2012 07:42:38 +1100
Subject: SCUMM: Fix if there is no costume set

---
 engines/scumm/costume.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index e3a2203adc..b2ad4b9b33 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1285,6 +1285,9 @@ void C64CostumeLoader::loadCostume(int id) {
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	ActorC64 *A = (ActorC64 *)a;
 
+	if(!a->_costume)
+		return;
+
 	loadCostume(a->_costume);
 
 	// Invalid costume command?
-- 
cgit v1.2.3