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

MP campaign start of scenario saves can be loaded again (bug #10058).

Browse source 
If a MP side has no colour defined fall back to the default side colour.
This commit is contained in:
Mark de Wever 2008-01-12 14:53:05 +00:00
parent 1829c48b21
commit 6ed79c166f
4 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -27,6 +27,8 @@ Version 1.3.13+svn:
* :droid can now use the additional parameters on & off to enable/disable
the AI status of a side instead of toggle it (FR #9676)
* fixed the MP campaign gold carry over (bug #10677)
* MP campaign start of scenario saves can be loaded again (bug #10058)
* if a MP side has no colour defined fall back to the default side colour
* sound:
* timer bell in MP starts when there are 20 seconds left and fades in
gradually for 10 seconds (fr #10559)

2
players_changelog
View file

@ -10,6 +10,8 @@ Version 1.3.13+svn:
* Multiplayer
* Revised maps: Den of Onis, Weldyn Channel.
* MP campaign gold carry over works properly now.
* MP campaign start of scenario saves can be loaded again.
* If a MP side has no colour defined fall back to the default side colour.
* User interface
* The apple key works as shortcut modifier again.

41
src/multiplayer_connect.cpp
View file

@ -1449,26 +1449,29 @@ void connect::load_game()
}
level_["savegame"] = "yes";
level_["map_data"] = state_.snapshot["map_data"];
level_["id"] = state_.snapshot["id"];
level_["name"] = state_.snapshot["name"];
// If we have a start of scenario MP campaign scenario the snapshot
// is empty the starting position contains the wanted info.
const config& start_data = !state_.snapshot.empty() ? state_.snapshot : state_.starting_pos;
level_["map_data"] = start_data["map_data"];
level_["id"] = start_data["id"];
level_["name"] = start_data["name"];
// Probably not needed.
level_["turn"] = state_.snapshot["turn_at"];
level_["turn_at"] = state_.snapshot["turn_at"];
level_["turns"] = state_.snapshot["turns"];
level_["mp_use_map_settings"] = state_.snapshot["mp_use_map_settings"];
level_["mp_village_gold"] = state_.snapshot["mp_village_gold"];
level_["mp_fog"] = state_.snapshot["mp_fog"];
level_["mp_shroud"] = state_.snapshot["mp_shroud"];
level_["mp_countdown"] = state_.snapshot["mp_countdown"];
level_["mp_countdown_init_time"] = state_.snapshot["mp_countdown_init_time"];
level_["mp_countdown_turn_bonus"] = state_.snapshot["mp_countdown_turn_bonus"];
level_["mp_countdown_action_bonus"] = state_.snapshot["mp_countdown_action_bonus"];
level_["experience_modifier"] = state_.snapshot["experience_modifier"];
level_["observer"] = state_.snapshot["observer"];
level_.add_child("snapshot") = state_.snapshot;
level_["random_seed"] = state_.snapshot["random_seed"];
level_["random_calls"] = state_.snapshot["random_calls"];
level_["turn"] = start_data["turn_at"];
level_["turn_at"] = start_data["turn_at"];
level_["turns"] = start_data["turns"];
level_["mp_use_map_settings"] = start_data["mp_use_map_settings"];
level_["mp_village_gold"] = start_data["mp_village_gold"];
level_["mp_fog"] = start_data["mp_fog"];
level_["mp_shroud"] = start_data["mp_shroud"];
level_["mp_countdown"] = start_data["mp_countdown"];
level_["mp_countdown_init_time"] = start_data["mp_countdown_init_time"];
level_["mp_countdown_turn_bonus"] = start_data["mp_countdown_turn_bonus"];
level_["mp_countdown_action_bonus"] = start_data["mp_countdown_action_bonus"];
level_["experience_modifier"] = start_data["experience_modifier"];
level_["observer"] = start_data["observer"];
level_.add_child("snapshot") = start_data;
level_["random_seed"] = start_data["random_seed"];
level_["random_calls"] = start_data["random_calls"];
// Adds the replay data, and the replay start, to the level,
// so clients can receive it.

4
src/multiplayer_wait.cpp
View file

@ -518,6 +518,10 @@ void wait::generate_menu()
} catch(config::error&) {
//ignore
}
} else {
//! @todo we fall back to the side colour, but that's ugly rather
// make the colour mandatory in 1.5.
disp_color = lexical_cast_default<int>(sd["side"], 0) - 1;
}
str << COLUMN_SEPARATOR << get_colour_string(disp_color);
details.push_back(str.str());