Author: anonymissimus
Date: Sun Nov 6 03:34:41 2011
New Revision: 51881
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51881&view=rev
Log:
Revert r51879 and r51880.
I didn't consider the mp aspect of this.
Modified:
trunk/src/gamestatus.cpp
Modified: trunk/src/gamestatus.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gamestatus.cpp?rev=51881&r1=51880&r2=51881&view=diff
==============================================================================
--- trunk/src/gamestatus.cpp (original)
+++ trunk/src/gamestatus.cpp Sun Nov 6 03:34:41 2011
@@ -782,11 +782,8 @@
log_step("objectives");
// If this team has no objectives, set its objectives
// to the level-global "objectives"
- const config::attribute_value objectives = level_["objectives"];
- if (!objectives.blank()) {
- WRN_NG << "[scenario]objectives= is deprecated, use
[event][objectives]\n";
- if(t_->objectives().empty())
t_->set_objectives(objectives.t_str(), false);
- }
+ if (t_->objectives().empty())
+ t_->set_objectives(level_["objectives"], false);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
