aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-05-01 01:30:19 +0000
committerTravis Howell2005-05-01 01:30:19 +0000
commit343debba1e3a097fbe47edad1ae4deb3a1a252e0 (patch)
treed68dcfcf8a060c44fb43cf065578c8a42583c3b7 /scumm
parent2260447e8b7a960a7e92c6c75f0ec66c079581b6 (diff)
downloadscummvm-rg350-343debba1e3a097fbe47edad1ae4deb3a1a252e0.tar.gz
scummvm-rg350-343debba1e3a097fbe47edad1ae4deb3a1a252e0.tar.bz2
scummvm-rg350-343debba1e3a097fbe47edad1ae4deb3a1a252e0.zip
Use correct safety check.
svn-id: r17878
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v100he.cpp2
-rw-r--r--scumm/script_v72he.cpp4
-rw-r--r--scumm/script_v80he.cpp4
-rw-r--r--scumm/script_v90he.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index eaa8a46fbf..298bcc4a70 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -2780,7 +2780,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) {
if (n) {
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+ a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor;
}
}
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index de6bbb1062..8feec7fac1 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1573,7 +1573,7 @@ void ScummEngine_v72he::o72_talkActor() {
_string[0].loadDefault();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "o72_talkActor");
+ a = derefActor(_actorToPrintStrFor, "o72_talkActor");
_string[0].color = a->_talkColor;
}
actorTalk(_scriptPointer);
@@ -2261,7 +2261,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
if (n) {
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+ a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor;
}
}
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 1385419222..e949a7172e 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -638,7 +638,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
}
if (type == 2) {
- Actor *a = derefActorSafe(id, "unknownE0");
+ Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x1, y1);
} else if (type == 3) {
WizImage wi;
@@ -701,7 +701,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
continue;
if (type == 2) {
- Actor *a = derefActorSafe(id, "unknownE0");
+ Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x, y);
} else if (type == 3) {
WizImage wi;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 142fdd9858..aa24c621b7 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -458,7 +458,7 @@ void ScummEngine_v90he::o90_getActorData() {
int val = pop();
int act = pop();
- a = derefActorSafe(act, "o90_getActorData");
+ a = derefActor(act, "o90_getActorData");
switch (subOp) {
case 1: