diff options
author | Max Horn | 2009-09-17 00:44:22 +0000 |
---|---|---|
committer | Max Horn | 2009-09-17 00:44:22 +0000 |
commit | 1f0e8ef4705ba242e66d5f8c0c20b2c21078bdf7 (patch) | |
tree | aa40cc4b1911f5d295aec08925a881e2338ce4dc /engines/sci/engine/kmovement.cpp | |
parent | b26f744e239f45d23bf122ca082948a7071a79b0 (diff) | |
download | scummvm-rg350-1f0e8ef4705ba242e66d5f8c0c20b2c21078bdf7.tar.gz scummvm-rg350-1f0e8ef4705ba242e66d5f8c0c20b2c21078bdf7.tar.bz2 scummvm-rg350-1f0e8ef4705ba242e66d5f8c0c20b2c21078bdf7.zip |
SCI: More cleanup
svn-id: r44129
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
-rw-r--r-- | engines/sci/engine/kmovement.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 19de6a99cb..cb1f841ece 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -391,7 +391,6 @@ reg_t kDoBresen(EngineState *s, int, int argc, reg_t *argv) { } extern void _k_dirloop(reg_t obj, uint16 angle, EngineState *s, int argc, reg_t *argv); -int is_heap_object(EngineState *s, reg_t pos); extern int get_angle(int xrel, int yrel); reg_t kDoAvoider(EngineState *s, int, int argc, reg_t *argv) { @@ -404,14 +403,14 @@ reg_t kDoAvoider(EngineState *s, int, int argc, reg_t *argv) { s->r_acc = make_reg(0, -1); - if (!is_heap_object(s, avoider)) { + if (!s->segMan->isHeapObject(avoider)) { warning("DoAvoider() where avoider %04x:%04x is not an object", PRINT_REG(avoider)); return NULL_REG; } client = GET_SEL32(avoider, client); - if (!is_heap_object(s, client)) { + if (!s->segMan->isHeapObject(client)) { warning("DoAvoider() where client %04x:%04x is not an object", PRINT_REG(client)); return NULL_REG; } @@ -419,7 +418,7 @@ reg_t kDoAvoider(EngineState *s, int, int argc, reg_t *argv) { looper = GET_SEL32(client, looper); mover = GET_SEL32(client, mover); - if (!is_heap_object(s, mover)) { + if (!s->segMan->isHeapObject(mover)) { if (mover.segment) { warning("DoAvoider() where mover %04x:%04x is not an object", PRINT_REG(mover)); } |