Merge branch 'master' of git://github.com/wesnoth/wesnoth

This commit is contained in:
Chris Beck 2014-07-16 17:31:03 -04:00
commit 8ae0dea1b5

View file

@ -964,16 +964,6 @@ bool game::process_turn(simple_wml::document& data, const player_map::const_iter
for(std::vector<int>::const_iterator j = marked.begin(); j != marked.end(); ++j) {
turn->remove_child("command",*j);
}
for (command = commands.begin(); command != commands.end(); ++command) {
if (simple_wml::node* attack = (**command).child("attack")) {
int seed = rand() & 0x7FFFFFFF;
attack->set_attr_int("seed", seed);
simple_wml::document doc;
simple_wml::node& rs = doc.root().add_child("random_seed");
rs.set_attr_int("seed", seed);
wesnothd::send_to_one(doc, user->first, "game replay");
}
}
if (turn->no_children()) {
return false;
}