[Scummvm-tracker] [ScummVM :: Bugs] #15018: MONKEY1 (Demo): Can't give breath mint to Otis in standalone demo

[ScummVM :: Bugs]

#15018: MONKEY1 (Demo): Can't give breath mint to Otis in standalone demo
----------------------------+------------------------------
Reporter:  SomeRandomHEFan  |       Owner:  (none)
    Type:  defect           |      Status:  new
Priority:  normal           |   Component:  Engine: SCUMM
 Version:                   |  Resolution:
Keywords:                   |        Game:  Monkey Island 1
----------------------------+------------------------------
Comment (by eriktorbjorn):

 Removing the hack and adding this one instead seems like the obvious
 solution to me:

 {{{
 diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
 index a2adf87dfac..64737deee36 100644
 --- a/engines/scumm/script_v5.cpp
 +++ b/engines/scumm/script_v5.cpp
 @@ -1206,8 +1206,9 @@ void ScummEngine_v5::o5_expression() {
  void ScummEngine_v5::o5_faceActor() {
         int act = getVarOrDirectByte(PARAM_1);
         int obj = getVarOrDirectWord(PARAM_2);
 -       Actor *a = derefActor(act, "o5_faceActor");
 -       a->faceToObject(obj);
 +       Actor *a = derefActorSafe(act, "o5_faceActor");
 +       if (a)
 +               a->faceToObject(obj);
  }
 }}}

 But that's just a guess.
-- 
Ticket URL: <https://bugs.scummvm.org/ticket/15018#comment:4>
ScummVM :: Bugs <https://bugs.scummvm.org>
ScummVM