diff options
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 26 |
3 files changed, 2 insertions, 29 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 503ac29c79..3db8b192f6 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -456,8 +456,7 @@ kGameIsRestarting(state_t *s, int funct_nr, int argc, reg_t *argv) { reg_t kHaveMouse(state_t *s, int funct_nr, int argc, reg_t *argv) { - return make_reg(0, (s->have_mouse_flag - && gfxop_have_mouse(s->gfx_state)) ? -1 : 0); + return make_reg(0, -1); } diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 3cde0ce780..9a77acb351 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -5266,7 +5266,7 @@ gamestate_restore(state_t *s, char *dirname) { retval->resource_dir = s->resource_dir; retval->work_dir = s->work_dir; retval->kernel_opt_flags = 0; - retval->have_mouse_flag = s->have_mouse_flag; + retval->have_mouse_flag = 1; retval->successor = NULL; retval->pic_priority_table = (int*)gfxop_get_pic_metainfo(retval->gfx_state); diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index fd3ddd7a5d..6ead77cad9 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -3148,35 +3148,9 @@ script_debug(state_t *s, reg_t *pc, stack_ptr_t *sp, stack_ptr_t *pp, reg_t *obj seg_id_t *segids, reg_t **variables, reg_t **variables_base, int *variables_nr, int bp) { - int have_windowed = s->gfx_state->driver->capabilities & GFX_CAPABILITY_WINDOWED; static int last_step; /* Do we support a separate console? */ -#ifndef WANT_CONSOLE - int missing_tty = !isatty(0) || !isatty(1); - - if (!have_windowed || missing_tty) { - script_debug_flag = sci_debug_flags = 0; - - fprintf(stderr, "On-screen console disabled and "); - if (!have_windowed) - fprintf(stderr, "driver claims to be running fullscreen.\n"); - else - fprintf(stderr, "no terminal found.\n"); - - if (last_step == script_step_counter) - fprintf(stderr, "This error seems to be unrecoverable.\n"); - if (script_error_flag || script_step_counter == last_step) { - fprintf(stderr, "Aborting...\n"); - exit(1); - } else - fprintf(stderr, "Continuing...\n"); - last_step = script_step_counter; - return; - } -#endif - - if (sci_debug_flags & _DEBUG_FLAG_LOGGING) { int old_debugstate = _debugstate_valid; |