upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 04:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the show_intro() stub procedure, replaced with show_storyscreen().

Browse Source
This commit is contained in:
Ignacio R. Morelle 2009-04-30 02:00:48 +00:00
parent 709ea04e11
commit 28ecafc930
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intro.cpp
View File

@ -97,12 +97,6 @@ void set_new_storyscreen(bool enabled)
LOG_NG << "enabled experimental story/endscreen code\n";
}
void show_intro(display &disp, const vconfig& data, const config& level)
{
const std::string scenario_name = level["name"];
show_storyscreen(disp,data,scenario_name);
}
void the_end(display &disp, std::string text, unsigned int duration)
{
if(use_shadowm_storyscreen) {

17
src/intro.hpp
View File

@ -24,23 +24,6 @@ class display;
#include <string>
/**
* Function to show an introduction sequence using story WML.
* The WML config data has a format similar to:
* @code
* [part]
* id='id'
* story='story'
* image='img'
* [/part]
* @endcode
* Where 'id' is a unique identifier, 'story' is text describing the
* storyline,and 'img' is a background image. Each part of the sequence will
* be displayed in turn, with the user able to go to the next part, or skip
* it entirely.
*/
void show_intro(display &disp, const vconfig& data, const config& level);
/**
* Displays a simple fading screen with any user-provided text.
* Used after the end of single-player campaigns.

4
src/playsingle_controller.cpp
View File

@ -26,7 +26,6 @@
#include "foreach.hpp"
#include "game_end_exceptions.hpp"
#include "gettext.hpp"
#include "intro.hpp"
#include "log.hpp"
#include "map_label.hpp"
#include "marked-up_text.hpp"
@ -36,6 +35,7 @@
#include "formula_string_utils.hpp"
#include "events.hpp"
#include "save_blocker.hpp"
#include "storyscreen/interface.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
@ -256,7 +256,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(
if(!skip_replay) {
foreach (const config &s, story) {
show_intro(*gui_, vconfig(s, true), level_);
show_storyscreen(*gui_, vconfig(s, true), level_["name"]);
}
}
gui_->labels().read(level_, game_events::get_state_of_game());