diff options
| author | Max Horn | 2003-05-23 13:24:41 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-23 13:24:41 +0000 |
| commit | c333b6d6ecb062ec18a36c09ef94c1098b38905d (patch) | |
| tree | 21f2d4e3981aeba904493cb76aee6f55c0b42e16 /scumm/akos.cpp | |
| parent | 28eade1da4e1811a230feb6c30d3abcf31deb0c2 (diff) | |
| download | scummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.tar.gz scummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.tar.bz2 scummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.zip | |
replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
svn-id: r7859
Diffstat (limited to 'scumm/akos.cpp')
| -rw-r--r-- | scumm/akos.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index bf4f4500cd..cfced1bc87 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -1464,7 +1464,7 @@ bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int switch (code) { case AKC_StartAnimInActor: - akos_queCommand(4, derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0); + akos_queCommand(4, derefActor(a->getAnimVar(GB(2)), "akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0); continue; case AKC_Random: @@ -1510,7 +1510,7 @@ bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int akos_queCommand(4, a, a->getAnimVar(GB(2)), 0); continue; case AKC_SetVarInActor: - derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4)); + derefActor(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4)); continue; case AKC_HideActor: akos_queCommand(1, a, 0, 0); |