diff options
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
-rw-r--r-- | engines/sci/engine/kscripts.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 45cd9cd5e3..7e37aa28cc 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -71,7 +71,7 @@ int invoke_selector(EngineState *s, reg_t object, int selector_id, int noinvalid slc_type = lookup_selector(s, object, selector_id, NULL, &address); if (slc_type == SELECTOR_NONE) { - error("Selector '%s' of object at "PREG" could not be invoked (%s L%d)", + SCIkwarn(SCIkERROR, "Selector '%s' of object at "PREG" could not be invoked (%s L%d)\n", s->selector_names[selector_id], PRINT_REG(object), fname, line); if (noinvalid == 0) KERNEL_OOPS("Not recoverable: VM was halted\n"); @@ -160,7 +160,7 @@ reg_t kClone(EngineState *s, int funct_nr, int argc, reg_t *argv) { int varblock_size; if (!parent_obj) { - error("Attempt to clone non-object/class at "PREG" failed", PRINT_REG(parent_addr)); + SCIkwarn(SCIkERROR, "Attempt to clone non-object/class at "PREG" failed", PRINT_REG(parent_addr)); return NULL_REG; } @@ -169,7 +169,7 @@ reg_t kClone(EngineState *s, int funct_nr, int argc, reg_t *argv) { clone_obj = sm_alloc_clone(&s->seg_manager, &clone_addr); if (!clone_obj) { - error("Cloning "PREG" failed-- internal error", PRINT_REG(parent_addr)); + SCIkwarn(SCIkERROR, "Cloning "PREG" failed-- internal error!\n", PRINT_REG(parent_addr)); return NULL_REG; } @@ -198,7 +198,7 @@ reg_t kDisposeClone(EngineState *s, int funct_nr, int argc, reg_t *argv) { word underBits; if (!victim_obj) { - error("Attempt to dispose non-class/object at "PREG"", + SCIkwarn(SCIkERROR, "Attempt to dispose non-class/object at "PREG"\n", PRINT_REG(victim_addr)); return s->r_acc; } @@ -246,12 +246,12 @@ reg_t kScriptID(EngineState *s, int funct_nr, int argc, reg_t *argv) { scr = &(s->seg_manager.heap[scriptid]->data.script); if (!scr->exports_nr) { - error("Script 0x%x does not have a dispatch table", script); + SCIkdebug(SCIkERROR, "Script 0x%x does not have a dispatch table\n", script); return NULL_REG; } if (index > scr->exports_nr) { - error("Dispatch index too big: %d > %d", index, scr->exports_nr); + SCIkwarn(SCIkERROR, "Dispatch index too big: %d > %d\n", index, scr->exports_nr); return NULL_REG; } |