Author: shadowmaster
Date: Thu Apr 30 04:00:48 2009
New Revision: 35334
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35334&view=rev
Log:
Get rid of the show_intro() stub procedure, replaced with show_storyscreen().
Modified:
trunk/src/intro.cpp
trunk/src/intro.hpp
trunk/src/playsingle_controller.cpp
Modified: trunk/src/intro.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/intro.cpp?rev=35334&r1=35333&r2=35334&view=diff
==============================================================================
--- trunk/src/intro.cpp (original)
+++ trunk/src/intro.cpp Thu Apr 30 04:00:48 2009
@@ -97,12 +97,6 @@
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) {
Modified: trunk/src/intro.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/intro.hpp?rev=35334&r1=35333&r2=35334&view=diff
==============================================================================
--- trunk/src/intro.hpp (original)
+++ trunk/src/intro.hpp Thu Apr 30 04:00:48 2009
@@ -25,23 +25,6 @@
#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.
*
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=35334&r1=35333&r2=35334&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Thu Apr 30 04:00:48 2009
@@ -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 @@
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());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
