aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorRobert Crossfield2012-01-31 07:42:38 +1100
committerTobias Gunkel2012-02-11 08:29:59 +0100
commita8008e0a717fd2bb1d697f04c1901397deabe958 (patch)
treee16163dc09914fac5d02e7ac4fb6f9cf63167954 /engines/scumm
parent92908bfc4b461dad5cf5811a0d3c167827ddf3b1 (diff)
downloadscummvm-rg350-a8008e0a717fd2bb1d697f04c1901397deabe958.tar.gz
scummvm-rg350-a8008e0a717fd2bb1d697f04c1901397deabe958.tar.bz2
scummvm-rg350-a8008e0a717fd2bb1d697f04c1901397deabe958.zip
SCUMM: Fix if there is no costume set
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/costume.cpp3
1 files changed, 3 insertions, 0 deletions
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?