Author: shadowmaster
Date: Mon Apr 27 23:42:16 2009
New Revision: 35272
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35272&view=rev
Log:
Undeprecate [part] and remove support for [page]. Once the class
definitions are renamed as well, we can start enabling this code.
Modified:
trunk/src/storyscreen/controller.cpp
trunk/src/storyscreen/interface.cpp
Modified: trunk/src/storyscreen/controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/controller.cpp?rev=35272&r1=35271&r2=35272&view=diff
==============================================================================
--- trunk/src/storyscreen/controller.cpp (original)
+++ trunk/src/storyscreen/controller.cpp Mon Apr 27 23:42:16 2009
@@ -70,12 +70,7 @@
const std::string key = i->first;
const vconfig node = i->second;
- // [page] and deprecated [part] (remove in 1.7.4)
- if((key == "page" || key == "part") && !node.empty()) {
- if(key == "part") {
- lg::wml_error << "[part] in [story] has been
deprecated and support for it will be removed in 1.7.4; use [page] instead.\n";
- }
-
+ if(key == "part" && !node.empty()) {
page* const story_page = new page(*gamestate_, node);
// Use scenario name as page title if the WML doesn't
supply a custom one.
if((*story_page).show_title() &&
(*story_page).title().empty()) {
Modified: trunk/src/storyscreen/interface.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/interface.cpp?rev=35272&r1=35271&r2=35272&view=diff
==============================================================================
--- trunk/src/storyscreen/interface.cpp (original)
+++ trunk/src/storyscreen/interface.cpp Mon Apr 27 23:42:16 2009
@@ -43,7 +43,7 @@
namespace {
void generate_endscreen_page_config(config& append_to_cfg)
{
- config& partcfg =
append_to_cfg.add_child("story").add_child("page");
+ config& partcfg =
append_to_cfg.add_child("story").add_child("part");
partcfg["text_align"] = "centered";
}
} // end anonymous namespace
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
