0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert recent test changes

Browse source
This commit is contained in:
Charles Dang 2018-06-30 04:02:55 +11:00
parent 55caeebffe
commit 87ae234022
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/dialogs/modal_dialog.cpp
View file

@ -69,7 +69,7 @@ bool modal_dialog::show(const unsigned auto_close_time)
pc.play_slice();
}
//return false;
return false;
}
build_window();

2
src/gui/dialogs/modeless_dialog.cpp
View file

@ -36,7 +36,7 @@ modeless_dialog::~modeless_dialog()
void modeless_dialog::show(const bool allow_interaction, const unsigned /*auto_close_time*/)
{
if(CVideo::get_singleton().faked()) {
//return;
return;
}
hide();

9
src/tests/utils/fake_display.cpp
View file

@ -58,7 +58,7 @@ fake_display_manager* fake_display_manager::get_manager()
}
fake_display_manager::fake_display_manager()
: video_(CVideo::FAKE)
: video_(CVideo::FAKE_TEST)
, dummy_cfg_()
, dummy_cfg2_()
, dummy_board_(std::make_shared<terrain_type_data>(dummy_cfg_), dummy_cfg2_)
@ -72,10 +72,13 @@ game_display& fake_display_manager::get_display()
return disp_;
}
game_display& get_fake_display(const int /*width*/, const int /*height*/)
game_display& get_fake_display(const int width, const int height)
{
game_display& display = fake_display_manager::get_manager()->get_display();
display.video().make_fake();
if(width >= 0 && height >= 0) {
display.video().make_test_fake(width, height);
}
return display;
}