aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v100he.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-05-01 01:02:34 +0000
committerTravis Howell2005-05-01 01:02:34 +0000
commit2260447e8b7a960a7e92c6c75f0ec66c079581b6 (patch)
tree336456041ee36fc7f94fed203f58e1f78f7f33ca /scumm/script_v100he.cpp
parent051977cd173b1b8efbba90e23d14479cec1bf2f5 (diff)
downloadscummvm-rg350-2260447e8b7a960a7e92c6c75f0ec66c079581b6.tar.gz
scummvm-rg350-2260447e8b7a960a7e92c6c75f0ec66c079581b6.tar.bz2
scummvm-rg350-2260447e8b7a960a7e92c6c75f0ec66c079581b6.zip
Add missing safety checks.
svn-id: r17877
Diffstat (limited to 'scumm/script_v100he.cpp')
-rw-r--r--scumm/script_v100he.cpp6
1 files changed, 4 insertions, 2 deletions
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: