Author: soliton
Date: Thu Mar 26 00:04:04 2009
New Revision: 34129
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34129&view=rev
Log:
also transfer AI sides automatically for non-host players
Modified:
branches/1.6/src/server/game.cpp
branches/1.6/src/server/game.hpp
Modified: branches/1.6/src/server/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/server/game.cpp?rev=34129&r1=34128&r2=34129&view=diff
==============================================================================
--- branches/1.6/src/server/game.cpp (original)
+++ branches/1.6/src/server/game.cpp Thu Mar 26 00:04:04 2009
@@ -472,12 +472,12 @@
}
}
-void game::transfer_ai_sides() {
+void game::transfer_ai_sides(const network::connection player) {
bool ai_transfer = false;
- // Check for ai sides first and drop them, too, if the host left.
+ // Check for ai sides of the leaving player.
for (size_t side = 0; side < side_controllers_.size(); ++side){
//send the host a notification of removal of this side
- if (side_controllers_[side] != "ai") continue;
+ if (sides_[side] != player || side_controllers_[side] != "ai")
continue;
ai_transfer = true;
simple_wml::document drop;
@@ -1020,7 +1020,7 @@
send_to_one(drop, owner_);
}
- if (host) transfer_ai_sides();
+ transfer_ai_sides(player);
DBG_GAME << debug_player_info();
send_user_list(player);
Modified: branches/1.6/src/server/game.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/server/game.hpp?rev=34129&r1=34128&r2=34129&view=diff
==============================================================================
--- branches/1.6/src/server/game.hpp (original)
+++ branches/1.6/src/server/game.hpp Thu Mar 26 00:04:04 2009
@@ -206,7 +206,7 @@
const player_map::const_iterator newplayer,
const bool player_left = true,
const std::string controller = "");
- void transfer_ai_sides();
+ void transfer_ai_sides(const network::connection player);
void send_data_team(simple_wml::document& data, const
simple_wml::string_span& team,
const network::connection exclude=0, std::string
packet_type = "") const;
void send_data_observers(simple_wml::document& data, const
network::connection exclude=0, std::string packet_type = "") const;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
