brmlab/brmlife
4
0
Fork 0
mirror of https://github.com/brmlab/brmlife.git synced 2025-08-03 02:13:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

connection::actions(): Fix negotiation termination by empty line

Browse source
This commit is contained in:
Petr Baudis 2011-12-26 20:27:29 +01:00
parent 4fb7b18dd3
commit a9884cf827
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
connection.cc
View file

@ -173,6 +173,15 @@ bump_negot:
negotiation = agent->newborn; negotiation = agent->newborn;
} }
} else if (negotiation && !cmd.compare("")) {
agent->newborn = negotiation = false;
if (!agent->tile)
agent->spawn();
std::stringstream s;
s << "agent_id " << agent->id << "\r\n";
out_buf.append(s.str());
} else if (!negotiation && !cmd.compare("move_dir") && !(mask & 1)) { } else if (!negotiation && !cmd.compare("move_dir") && !(mask & 1)) {
int x = 0, y = 0; int x = 0, y = 0;
sscanf(line.c_str(), "%d %d", &x, &y); sscanf(line.c_str(), "%d %d", &x, &y);
@ -214,16 +223,6 @@ bump_negot:
} }
in_buf.erase(0, 2); in_buf.erase(0, 2);
if (negotiation) {
agent->newborn = negotiation = false;
if (!agent->tile)
agent->spawn();
std::stringstream s;
s << "agent_id " << agent->id << "\r\n";
out_buf.append(s.str());
}
pthread_mutex_unlock(&buf_lock); pthread_mutex_unlock(&buf_lock);
} }