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

Enable new storyscreen by default (but not remove the old one yet)

Browse source 
Also removes an unnecessary trigger_full_redraw call from the new codepath.
This commit is contained in:
Charles Dang 2017-04-09 15:13:00 +11:00
parent 3b88044816
commit 76f92a205f
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/storyscreen/interface.cpp
View file

@ -39,26 +39,21 @@ static lg::log_domain log_engine("engine");
void show_story(CVideo& video, const std::string &scenario_name,
const config::const_child_itors &story)
{
if(gui2::new_widgets) {
// Combine all the [story] tags into a single config
config cfg;
for(const auto& iter : story) {
cfg.append_children(iter);
}
if(!cfg.has_child("part")) {
return;
}
storyscreen::controller controller(video, vconfig(cfg, true), scenario_name, 0);
gui2::dialogs::story_viewer::display(controller, video);
video2::trigger_full_redraw();
// Combine all the [story] tags into a single config
config cfg;
for(const auto& iter : story) {
cfg.append_children(iter);
}
if(!cfg.has_child("part")) {
return;
}
storyscreen::controller controller(video, vconfig(cfg, true), scenario_name, 0);
gui2::dialogs::story_viewer::display(controller, video);
#if 0
events::event_context story_context;
int segment_count = 0;
@ -92,4 +87,5 @@ void show_story(CVideo& video, const std::string &scenario_name,
}
video2::trigger_full_redraw();
return;
#endif
}