upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed the remaining references to player_info from playcampaign.cpp

Browse Source
This commit is contained in:
Eugen Jiresch 2009-07-20 14:49:35 +00:00
parent ec9b6a4615
commit e3b3654b1d
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/playcampaign.cpp
View File

@ -248,19 +248,6 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
if (!gamestate.snapshot["label"].empty()){
gamestate.classification().label = gamestate.snapshot["label"];
}
// Also get the recruitment list if there are some specialties in this scenario
foreach (const config &p, gamestate.snapshot.child_range("side"))
{
player_info *player = gamestate.get_player(p["save_id"]);
if (!player) continue;
const std::string &can_recruit_str = p["recruit"];
if (!can_recruit_str.empty()) {
player->can_recruit.clear();
std::vector<std::string> can_recruit = utils::split(can_recruit_str);
player->can_recruit.insert(can_recruit.begin(), can_recruit.end());
}
}
}
controller_map controllers;
@ -482,9 +469,8 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
*/
controller_map::const_iterator ctr = controllers.find(id);
if(ctr != controllers.end()) {
player_info *player = gamestate.get_player(id);
if (player) {
side["current_player"] = player->name;
if (const config& c = gamestate.snapshot.find_child("side", "save_id", id)) {
side["current_player"] = c["name"];
}
side["controller"] = ctr->second.controller;
}