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

do the random map generation before we send next scenario data out...

Browse source 
...so it's in sync; fixed bug #12896: Map generator does not sync
between clients when advancing in MP campaigns
This commit is contained in:
Gunter Labes 2009-02-09 13:54:57 +00:00
parent b3cbc45069
commit 89fc59cff6
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -4,6 +4,8 @@ Version 1.4.7+svn:
* miscellaneous and bug fixes:
* AmigaOS4: Minimum stack cookie to prevent stack overflow (patch #1107)
* Additional screenmodes for when SDL can't guess them (patch #1108)
* Fixed bug #12896: Map generator does not sync between clients when
advancing in MP campaigns
Version 1.4.7:
* campaigns:

36
src/playcampaign.cpp
View file

@ -514,13 +514,45 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
player_info *player = gamestate.get_player(id);
if (player) {
(**side)["current_player"] = player->name;
//! @todo TODO : remove (see TODO line 276 in server/game.cpp)
(**side)["user_description"] = player->name;
}
(**side)["controller"] = ctr->second.controller;
}
}
// If the entire scenario should be randomly generated
if((*scenario)["scenario_generation"] != "") {
LOG_G << "randomly generating scenario...\n";
const cursor::setter cursor_setter(cursor::WAIT);
static config scenario2;
scenario2 = random_generate_scenario((*scenario)["scenario_generation"], scenario->child("generator"));
//level_ = scenario;
gamestate.starting_pos = scenario2;
scenario = &scenario2;
}
std::string map_data = (*scenario)["map_data"];
if(map_data.empty() && (*scenario)["map"] != "") {
map_data = read_map((*scenario)["map"]);
}
// If the map should be randomly generated
if(map_data.empty() && (*scenario)["map_generation"] != "") {
const cursor::setter cursor_setter(cursor::WAIT);
map_data = random_generate_map((*scenario)["map_generation"],scenario->child("generator"));
// Since we've had to generate the map,
// make sure that when we save the game,
// it will not ask for the map to be generated again on reload
static config new_level;
new_level = *scenario;
new_level.values["map_data"] = map_data;
scenario = &new_level;
gamestate.starting_pos = new_level;
LOG_G << "generated map\n";
}
// Sends scenario data
config cfg;
cfg.add_child("store_next_scenario", *scenario);