When loading a savegame don't offer to take the non-player sides (bug #10746).

This commit is contained in:
Mark de Wever 2008-02-03 19:23:47 +00:00
parent 9be51abe0b
commit 504f79fca3
4 changed files with 6 additions and 0 deletions

View file

@ -15,6 +15,8 @@ Version 1.3.15+svn:
* Made era not required while loading save game
* Removed bogus client commands about takeing side
* Fixed control change when giving own team (bug #6639)
* when loading a savegame don't offer to take the non-player sides (bug
#10746)
* User interface
* During dialogs the speaker is shown in the sidebar and highlighted.
* During ai moves the source hex is no longer highlighted.

View file

@ -12,6 +12,7 @@ Version 1.3.15+svn:
* Multiplayer
* Reloaded games are displayed in yellow (instead of green) in the game
list as they are also a kind of already running games.
* When loading a savegame don't offer to take the non-player sides.
* User interface
* During dialogs the speaker is shown in the sidebar and highlighted.
* Show unit standing animations and idle animations are now separate options

View file

@ -112,6 +112,7 @@ team::team_info::team_info(const config& cfg) :
share_maps(false),
share_view(false),
disallow_observers(utils::string_bool(cfg["disallow_observers"])),
allow_player(utils::string_bool(cfg["allow_player"], true)),
music(cfg["music"]),
colour(cfg["colour"].size() ? cfg["colour"] : cfg["side"])
{
@ -298,6 +299,7 @@ void team::team_info::write(config& cfg) const
cfg["action_bonus_count"]= str_cast(action_bonus_count);
cfg["village_gold"] = str_cast(income_per_village);
cfg["disallow_observers"] = disallow_observers ? "yes" : "no";
cfg["allow_player"] = allow_player ? "yes" : "no";
std::stringstream enemies_str;
for(std::vector<int>::const_iterator en = enemies.begin(); en != enemies.end(); ++en) {

View file

@ -110,6 +110,7 @@ public:
bool share_maps, share_view;
bool disallow_observers;
bool allow_player;
std::string music;