TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass explicit nullptr for ui_create_dialog createdata

Browse source
This commit is contained in:
Kp 2020-10-12 03:28:25 +00:00
parent 1864f2dfdf
commit c1ce3a2938
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/ui.h
View file

@ -262,8 +262,8 @@ int ui_messagebox( short xc, short yc, const char * text, const ui_messagebox_ti
class unused_ui_userdata_t;
constexpr unused_ui_userdata_t *unused_ui_userdata = nullptr;
template <typename T1, typename T2 = const void>
T1 *ui_create_dialog(const short x, const short y, const short w, const short h, const enum dialog_flags flags, T2 *const createdata = nullptr)
template <typename T1, typename T2>
T1 *ui_create_dialog(const short x, const short y, const short w, const short h, const enum dialog_flags flags, const T2 createdata)
{
auto r = std::make_unique<T1>(x, y, w, h, flags);
r->send_creation_events(createdata);

2
d1x-rebirth/editor/ehostage.cpp
View file

@ -114,7 +114,7 @@ int do_hostage_dialog()
close_all_windows();
// Open a window with a quit button
MainWindow = ui_create_dialog<hostage_dialog>(TMAPBOX_X + 10, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG);
MainWindow = ui_create_dialog<hostage_dialog>(TMAPBOX_X + 10, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG, nullptr);
return 1;
}

2
similar/editor/centers.cpp
View file

@ -108,7 +108,7 @@ int do_centers_dialog()
const unsigned x = 20;
const unsigned width = 740;
#endif
MainWindow = ui_create_dialog<centers_dialog>(x, TMAPBOX_Y + 20, width, 545 - TMAPBOX_Y, DF_DIALOG);
MainWindow = ui_create_dialog<centers_dialog>(x, TMAPBOX_Y + 20, width, 545 - TMAPBOX_Y, DF_DIALOG, nullptr);
return 1;
}

2
similar/editor/eswitch.cpp
View file

@ -337,7 +337,7 @@ int do_trigger_dialog()
#endif
// Open a window with a quit button
MainWindow = ui_create_dialog<trigger_dialog>(TMAPBOX_X + 20, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG);
MainWindow = ui_create_dialog<trigger_dialog>(TMAPBOX_X + 20, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG, nullptr);
return 1;
}

2
similar/editor/med.cpp
View file

@ -758,7 +758,7 @@ static void init_editor_screen(grs_canvas &canvas)
gr_set_curfont(canvas, editor_font);
gr_set_fontcolor(canvas, CBLACK, CWHITE);
EditorWindow = ui_create_dialog<editor_dialog>(0, 0, ED_SCREEN_W, ED_SCREEN_H, DF_FILLED);
EditorWindow = ui_create_dialog<editor_dialog>(0, 0, ED_SCREEN_W, ED_SCREEN_H, DF_FILLED, nullptr);
auto e = EditorWindow;
LargeViewBox = ui_add_gadget_userbox(e,LVIEW_X,LVIEW_Y,LVIEW_W,LVIEW_H);

2
similar/editor/medrobot.cpp
View file

@ -523,7 +523,7 @@ int do_robot_dialog()
Cur_goody_count = 0;
// Open a window with a quit button
MainWindow = ui_create_dialog<robot_dialog>(TMAPBOX_X + 20, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG);
MainWindow = ui_create_dialog<robot_dialog>(TMAPBOX_X + 20, TMAPBOX_Y + 20, 765 - TMAPBOX_X, 545 - TMAPBOX_Y, DF_DIALOG, nullptr);
return 1;
}