From 2260447e8b7a960a7e92c6c75f0ec66c079581b6 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 1 May 2005 01:02:34 +0000
Subject: Add missing safety checks.

svn-id: r17877
---
 scumm/script_v100he.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scumm/script_v100he.cpp')

diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 6210ce2522..eaa8a46fbf 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -2779,8 +2779,10 @@ void ScummEngine_v100he::decodeParseString(int m, int n) {
 		_string[m].loadDefault();
 		if (n) {
 			_actorToPrintStrFor = pop();
-			a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
-			_string[0].color = a->_talkColor;
+			if (_actorToPrintStrFor != 0xFF) {
+				a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+				_string[0].color = a->_talkColor;
+			}
 		}
 		break;
 	case 92:
-- 
cgit v1.2.3