mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-27 18:58:35 +00:00
fixed compile error in Windows
This commit is contained in:
parent
967db0e428
commit
9b3a87deda
@ -44,11 +44,10 @@ public:
|
||||
private:
|
||||
positions_map positions_;
|
||||
config& players_;
|
||||
std::vector<config*>& sides_;
|
||||
};
|
||||
|
||||
connection_acceptor::connection_acceptor(config& players)
|
||||
: players_(players), sides_(players.children["side"])
|
||||
: players_(players)
|
||||
{
|
||||
std::vector<config*>& sides = players.children["side"];
|
||||
for(std::vector<config*>::const_iterator i = sides.begin();
|
||||
@ -69,6 +68,8 @@ int connection_acceptor::do_action()
|
||||
|
||||
config cfg;
|
||||
|
||||
std::vector<config*>& sides = players_.children["side"];
|
||||
|
||||
try {
|
||||
sock = network::receive_data(cfg);
|
||||
} catch(network::error& e) {
|
||||
@ -104,15 +105,15 @@ int connection_acceptor::do_action()
|
||||
|
||||
if(sock) {
|
||||
const int side_taken = atoi(cfg.values["side"].c_str())-1;
|
||||
if(side_taken >= 0 && side_taken < int(sides_.size())) {
|
||||
positions_map::iterator pos = positions_.find(sides_[side_taken]);
|
||||
if(side_taken >= 0 && side_taken < int(sides.size())) {
|
||||
positions_map::iterator pos = positions_.find(sides[side_taken]);
|
||||
if(pos != positions_.end()) {
|
||||
if(!pos->second) {
|
||||
std::cerr << "client has taken a valid position\n";
|
||||
|
||||
//broadcast to everyone the new game status
|
||||
pos->first->values["taken"] = "yes";
|
||||
positions_[sides_[side_taken]] = sock;
|
||||
positions_[sides[side_taken]] = sock;
|
||||
network::send_data(players_);
|
||||
|
||||
std::cerr << "sent player data\n";
|
||||
|
Loading…
x
Reference in New Issue
Block a user