diff options
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index c4d3f2f485..262b4b5e14 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1635,7 +1635,7 @@ static void _k_draw_control(EngineState *s, reg_t obj, int inverse) { int entry_size = GET_SEL32V(obj, x); int i; - debugC(2, kDebugLevelGraphics, "drawing list control %04x to %d,%d, diff %d\n", obj, x, y, SCI_MAX_SAVENAME_LENGTH); + debugC(2, kDebugLevelGraphics, "drawing list control %04x:%04x to %d,%d, diff %d\n", PRINT_REG(obj), x, y, SCI_MAX_SAVENAME_LENGTH); cursor = GET_SEL32V(obj, cursor) - text_pos.offset; entries_nr = 0; @@ -2166,7 +2166,7 @@ static void _k_redraw_view_list(EngineState *s, GfxList *list) { GfxDynView *view = (GfxDynView *) list->_contents; while (view) { - debugC(2, kDebugLevelGraphics, " dv[%04x:%04x]: signal %04x\n", make_reg(view->_ID, view->_subID), view->signal); + debugC(2, kDebugLevelGraphics, " dv[%04x:%04x]: signal %04x\n", PRINT_REG(make_reg(view->_ID, view->_subID)), view->signal); // step 1 of subalgorithm if (view->signal & _K_VIEW_SIG_FLAG_NO_UPDATE) { @@ -3008,7 +3008,7 @@ reg_t kAnimate(EngineState *s, int funct_nr, int argc, reg_t *argv) { _k_prepare_view_list(s, templist, _K_MAKE_VIEW_LIST_CALC_PRIORITY); if (s->pic_not_valid) { - debugC(2, kDebugLevelGraphics, "PicNotValid=%d -> Subalgorithm:\n"); + debugC(2, kDebugLevelGraphics, "PicNotValid=%d -> Subalgorithm:\n", s->pic_not_valid); _k_redraw_view_list(s, templist); } @@ -3299,7 +3299,7 @@ reg_t kDisplay(EngineState *s, int funct_nr, int argc, reg_t *argv) { s->r_acc = graph_save_box(s, save_area); text_handle->_serial++; // This is evil! - debugC(2, kDebugLevelGraphics, "Saving (%d, %d) size (%d, %d) as %04x:%04x\n", save_area.x, save_area.y, save_area.width, save_area.height, s->r_acc); + debugC(2, kDebugLevelGraphics, "Saving (%d, %d) size (%d, %d) as %04x:%04x\n", save_area.x, save_area.y, save_area.width, save_area.height, PRINT_REG(s->r_acc)); } debugC(2, kDebugLevelGraphics, "Display: Commiting text '%s'\n", text); diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 16b1df6fcb..85b3adf836 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -620,7 +620,7 @@ reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) { destx = GET_SEL32V(mover, x); desty = GET_SEL32V(mover, y); - debugC(2, kDebugLevelBresen, "Doing avoider %04x (dest=%d,%d)\n", avoider, destx, desty); + debugC(2, kDebugLevelBresen, "Doing avoider %04x:%04x (dest=%d,%d)\n", PRINT_REG(avoider), destx, desty); if (invoke_selector(INV_SEL(mover, doit, 1) , 0)) { error("Mover %04x:%04x of avoider %04x:%04x doesn't have a doit() funcselector\n", PRINT_REG(mover), PRINT_REG(avoider)); diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 262eff05df..49daacb0dc 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -540,7 +540,7 @@ reg_t kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) { s->_sound.sfx_song_set_loops(handle, looping); s->_sound.sfx_song_renice(handle, pri); - debugC(2, kDebugLevelSound, "[sound01-update-handle] -- CUE %04x:%04x"); + debugC(2, kDebugLevelSound, "[sound01-update-handle] -- CUE %04x:%04x", PRINT_REG(obj)); PUT_SEL32V(obj, signal, signal); PUT_SEL32V(obj, min, min); diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index b54aae338b..6eb882c35e 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -380,7 +380,7 @@ static int c_vr(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) { break; case KSIG_LIST: { - List *l = lookup_list(s, reg); + //List *l = lookup_list(s, reg); sciprintf("list\n"); |