diff options
Diffstat (limited to 'engines/sci/engine')
-rw-r--r-- | engines/sci/engine/gc.cpp | 3 | ||||
-rw-r--r-- | engines/sci/engine/kernel.cpp | 3 | ||||
-rw-r--r-- | engines/sci/engine/seg_manager.cpp | 3 | ||||
-rw-r--r-- | engines/sci/engine/vm.cpp | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index ff59f37328..5cca5bd34e 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -79,8 +79,7 @@ static reg_t worklist_pop(worklist_t **wlp) { reg_t retval; if (!wl || !wl->used) { - fprintf(stderr, "Attempt to pop from empty worklist"); - exit(1); + error("Attempt to pop from empty worklist"); } retval = wl->entries[--wl->used]; diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index d39355bff5..ef730824bd 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -727,9 +727,8 @@ void kernel_compile_signature(const char **s) { break; default: { - sciprintf("INTERNAL ERROR when compiling kernel function signature '%s': (%02x) not understood (aka" + error("INTERNAL ERROR when compiling kernel function signature '%s': (%02x) not understood (aka" " '%c')\n", *s, c, c); - exit(1); } } } while (*src && (*src == KSIG_SPEC_ALLOW_INV || *src == KSIG_SPEC_ELLIPSIS || (c < 'a' && c != KSIG_SPEC_ANY))); diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index 2cbda7724f..ab29fd4aa8 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -1808,8 +1808,7 @@ seg_interface_t *get_seg_interface(SegManager *self, seg_id_t segid) { memcpy(retval, seg_interfaces[mobj->type - 1], sizeof(seg_interface_t)); if (mobj->type != retval->type_id) { - fprintf(stderr, "Improper segment interface for %d", mobj->type); - exit(1); + error(stderr, "Improper segment interface for %d", mobj->type); } retval->segmgr = self; diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 21dabcc756..55febf4ca7 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -540,8 +540,7 @@ void vm_handle_fatal_error(EngineState *s, int line, const char *file) { if (jump_initialized) longjmp(vm_error_address, 0); #endif - fprintf(stderr, "Could not recover, exitting...\n"); - exit(1); + error(stderr, "Could not recover, exitting...\n"); } static inline script_t *script_locate_by_segment(EngineState *s, seg_id_t seg) { |