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

Reverted 2011-12-16T20:13:27Z!anonymissimus@arcor.de through 2011-12-16T20:14:24Z!anonymissimus@arcor.de; redid 2011-12-16T04:06:47Z!Majora700@gmail.com right.

Browse source
This commit is contained in:
Steven Panek 2011-12-16 20:48:39 +00:00
parent e2b5f1694d
commit 44cbafee63
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -45,6 +45,8 @@ Version 1.9.12+svn:
* Display turn numbers on multi-turn planned moves
* Fix attacks not finishing but still being transmitted over the network when
executing all actions
* WML engine:
* Made it so that [modify_side] can change the current_player attribute
* Miscellaneous and bug fixes:
* Fixed: compilation with clang 3.0 in C++11 mode.
* Changed: Sort order of campaigns uses a stable sort now.

10
data/campaigns/tutorial/scenarios/1_Tutorial.cfg
View file

@ -195,12 +195,10 @@ Recruiting"
name= _"Li’sar"
canrecruit=yes
[/unit]
[lua]
code=<<
local _ = wesnoth.textdomain("wesnoth-tutorial")
wesnoth.sides[1].current_player = tostring(_"Li’sar") --# wmllint: ignore
>>
[/lua]
[modify_side]
side=1
current_player= _"Li’sar"
[/modify_side]
[redraw][/redraw]
[/command]
[/option]

10
data/campaigns/tutorial/scenarios/2_Tutorial.cfg
View file

@ -412,12 +412,10 @@
equals=female
[/variable]
[then]
[lua]
code=<<
local _ = wesnoth.textdomain("wesnoth-tutorial")
wesnoth.sides[1].current_player = tostring(_"Li’sar") --# wmllint: ignore
>>
[/lua]
[modify_side]
side=1
current_player= _"Li’sar"
[/modify_side]
[store_unit]
[filter]
id=student

5
src/game_events.cpp
View file

@ -953,6 +953,7 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
std::string team_name = cfg["team_name"];
std::string user_team_name = cfg["user_team_name"];
std::string current_player = cfg["current_player"];
std::string controller = cfg["controller"];
std::string recruit_str = cfg["recruit"];
std::string shroud_data = cfg["shroud_data"];
@ -980,6 +981,10 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
teams[team_index].change_team(teams[team_index].team_name(),
user_team_name);
}
if (!current_player.empty()) {
LOG_NG << "change side's current_player to '" << current_player << "'\n";
teams[team_index].set_current_player(current_player);
}
// Modify recruit list (override)
if (!recruit_str.empty()) {
std::vector<std::string> recruit = utils::split(recruit_str);