diff --git a/engines/ultima/nuvie/gui/gui_callback.h b/engines/ultima/nuvie/gui/gui_callback.h index 641cd7c55b3..eecb3786ae1 100644 --- a/engines/ultima/nuvie/gui/gui_callback.h +++ b/engines/ultima/nuvie/gui/gui_callback.h @@ -39,7 +39,7 @@ public: return; } virtual GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) { - DEBUG(0, LEVEL_WARNING, "Unhandled callback. msg (%x)\n", msg); + DEBUG(false, LEVEL_WARNING, "Unhandled callback. msg (%x)\n", msg); return GUI_PASS; } diff --git a/engines/ultima/nuvie/gui/gui_drag_manager.cpp b/engines/ultima/nuvie/gui/gui_drag_manager.cpp index b03fd414c0c..de6191902ea 100644 --- a/engines/ultima/nuvie/gui/gui_drag_manager.cpp +++ b/engines/ultima/nuvie/gui/gui_drag_manager.cpp @@ -34,7 +34,7 @@ GUI_DragManager::GUI_DragManager(Screen *s): screen(s), message(0), } GUI_status GUI_DragManager::start_drag(GUI_DragArea *src, int msg, void *d, unsigned char *icon_buf, uint16 w, uint16 h, uint8 bpp, bool out_of_range) { - DEBUG(0, LEVEL_DEBUGGING, "Start Drag\n"); + DEBUG(false, LEVEL_DEBUGGING, "Start Drag\n"); drag_source = src; message = msg; diff --git a/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp b/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp index 04674f9308a..738e9c166a0 100644 --- a/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp +++ b/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp @@ -29,7 +29,7 @@ GUI_TextToggleButton::GUI_TextToggleButton(void *data, int x, int y, int w, int const char *const *texts_, int count_, int selection_, GUI_Font *font, ButtonTextAlign alignment_, GUI_CallBack *callback, int flat) - : GUI_Button(data, x, y, w, h, "", font, alignment_, 0, callback, flat), count(count_), + : GUI_Button(data, x, y, w, h, "", font, alignment_, false, callback, flat), count(count_), selection(selection_), alignment(alignment_) { assert(count > 0); assert(selection >= 0 && selection < count); diff --git a/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp b/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp index 1f11e624037..1d8028cbf21 100644 --- a/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp +++ b/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp @@ -39,11 +39,11 @@ GUI_YesNoDialog::GUI_YesNoDialog(GUI *gui, int x, int y, int w, int h, const cha yes_callback_object(yesCallback), no_callback_object(noCallback) { GUI_Widget *widget; - yes_button = new GUI_Button(this, 100, 50, 40, 18, "Yes", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0); + yes_button = new GUI_Button(this, 100, 50, 40, 18, "Yes", gui->get_font(), BUTTON_TEXTALIGN_CENTER, false, this, false); AddWidget(yes_button); button_index[0] = yes_button; - no_button = new GUI_Button(this, 30, 50, 40, 18, "No", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0); + no_button = new GUI_Button(this, 30, 50, 40, 18, "No", gui->get_font(), BUTTON_TEXTALIGN_CENTER, false, this, false); AddWidget(no_button); button_index[1] = no_button; diff --git a/engines/ultima/nuvie/sound/adplug/u6m.h b/engines/ultima/nuvie/sound/adplug/u6m.h index 9a3be0ff851..e789c08eecb 100644 --- a/engines/ultima/nuvie/sound/adplug/u6m.h +++ b/engines/ultima/nuvie/sound/adplug/u6m.h @@ -32,8 +32,8 @@ class Cu6mPlayer: public CPlayer { public: static CPlayer *factory(Copl *newopl); - Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0), driver_active(0), - songend(0), song_pos(0), loop_position(0), read_delay(0), played_ticks(0) { + Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0), driver_active(false), + songend(false), song_pos(0), loop_position(0), read_delay(0), played_ticks(0) { ARRAYCLEAR(channel_freq); }