thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct safety check.

Browse source 
svn-id: r17878
This commit is contained in:
Travis Howell 2005-05-01 01:30:19 +00:00
parent 2260447e8b
commit 343debba1e
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/script_v100he.cpp
View file

@ -2780,7 +2780,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) {
if (n) { if (n) {
_actorToPrintStrFor = pop(); _actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) { if (_actorToPrintStrFor != 0xFF) {
a = derefActorSafe(_actorToPrintStrFor, "decodeParseString"); a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor; _string[0].color = a->_talkColor;
} }
} }

4
scumm/script_v72he.cpp
View file

@ -1573,7 +1573,7 @@ void ScummEngine_v72he::o72_talkActor() {
_string[0].loadDefault(); _string[0].loadDefault();
if (_actorToPrintStrFor != 0xFF) { if (_actorToPrintStrFor != 0xFF) {
a = derefActorSafe(_actorToPrintStrFor, "o72_talkActor"); a = derefActor(_actorToPrintStrFor, "o72_talkActor");
_string[0].color = a->_talkColor; _string[0].color = a->_talkColor;
} }
actorTalk(_scriptPointer); actorTalk(_scriptPointer);
@ -2261,7 +2261,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
if (n) { if (n) {
_actorToPrintStrFor = pop(); _actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) { if (_actorToPrintStrFor != 0xFF) {
a = derefActorSafe(_actorToPrintStrFor, "decodeParseString"); a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor; _string[0].color = a->_talkColor;
} }
} }

4
scumm/script_v80he.cpp
View file

@ -638,7 +638,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
} }
if (type == 2) { if (type == 2) {
Actor *a = derefActorSafe(id, "unknownE0"); Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x1, y1); a->drawActorToBackBuf(x1, y1);
} else if (type == 3) { } else if (type == 3) {
WizImage wi; WizImage wi;
@ -701,7 +701,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
continue; continue;
if (type == 2) { if (type == 2) {
Actor *a = derefActorSafe(id, "unknownE0"); Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x, y); a->drawActorToBackBuf(x, y);
} else if (type == 3) { } else if (type == 3) {
WizImage wi; WizImage wi;

2
scumm/script_v90he.cpp
View file

@ -458,7 +458,7 @@ void ScummEngine_v90he::o90_getActorData() {
int val = pop(); int val = pop();
int act = pop(); int act = pop();
a = derefActorSafe(act, "o90_getActorData"); a = derefActor(act, "o90_getActorData");
switch (subOp) { switch (subOp) {
case 1: case 1: