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

connection::actions(): agent& -> agent*, more natural agent_id handling

Browse source
This commit is contained in:
Petr Baudis 2011-12-08 03:02:08 +01:00
parent 8ae6051e97
commit b693b5d6f4
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
agent.cc
View file

@ -131,7 +131,7 @@ agent::on_action_takes(void)
return; return;
} }
conn->actions(*this); conn->actions(this);
} }
void void

29
connection.cc
View file

@ -87,7 +87,7 @@ connection::bump(void)
} }
void void
connection::actions(class agent &agent) connection::actions(class agent *agent)
{ {
pthread_mutex_lock(&buf_lock); pthread_mutex_lock(&buf_lock);
if (buf_incomplete(in_buf)) { if (buf_incomplete(in_buf)) {
@ -107,20 +107,20 @@ connection::actions(class agent &agent)
line.erase(0, spofs + 1); line.erase(0, spofs + 1);
if (negotiation && !cmd.compare("move")) { if (negotiation && !cmd.compare("move")) {
double rate = agent.attr.move; double rate = agent->attr.move;
sscanf(line.c_str(), "%lf", &rate); sscanf(line.c_str(), "%lf", &rate);
if (rate >= 0 && rate <= 1) if (rate >= 0 && rate <= 1)
agent.attr.move = rate; agent->attr.move = rate;
} else if (negotiation && !cmd.compare("attack")) { } else if (negotiation && !cmd.compare("attack")) {
double rate = agent.attr.attack; double rate = agent->attr.attack;
sscanf(line.c_str(), "%lf", &rate); sscanf(line.c_str(), "%lf", &rate);
if (rate >= 0 && rate <= 1) if (rate >= 0 && rate <= 1)
agent.attr.attack = rate; agent->attr.attack = rate;
} else if (negotiation && !cmd.compare("defense")) { } else if (negotiation && !cmd.compare("defense")) {
double rate = agent.attr.defense; double rate = agent->attr.defense;
sscanf(line.c_str(), "%lf", &rate); sscanf(line.c_str(), "%lf", &rate);
if (rate >= 0 && rate <= 1) if (rate >= 0 && rate <= 1)
agent.attr.defense = rate; agent->attr.defense = rate;
} else if (negotiation && !cmd.compare("agent_id")) { } else if (negotiation && !cmd.compare("agent_id")) {
int id = -1; int id = -1;
@ -140,8 +140,9 @@ bump_negot:
goto bump_negot; goto bump_negot;
/* Round and round she goes, where she stops, nobody knows. */ /* Round and round she goes, where she stops, nobody knows. */
a2->conn = this; a2->conn = this;
agent.conn = NULL; agent->conn = NULL;
negotiation = false; agent = a2;
negotiation = agent->newborn;
} }
} else if (!negotiation && !cmd.compare("move_dir") && !(mask & 1)) { } else if (!negotiation && !cmd.compare("move_dir") && !(mask & 1)) {
@ -149,7 +150,7 @@ bump_negot:
sscanf(line.c_str(), "%d %d", &x, &y); sscanf(line.c_str(), "%d %d", &x, &y);
if (x < -1) x = -1; if (x > 1) x = 1; if (x < -1) x = -1; if (x > 1) x = 1;
if (y < -1) y = -1; if (y > 1) y = 1; if (y < -1) y = -1; if (y > 1) y = 1;
if (!agent.move_dir(x, y)) if (!agent->move_dir(x, y))
bump(); bump();
mask |= 1; mask |= 1;
} else if (!negotiation && !cmd.compare("attack_dir") && !(mask & 2)) { } else if (!negotiation && !cmd.compare("attack_dir") && !(mask & 2)) {
@ -157,7 +158,7 @@ bump_negot:
sscanf(line.c_str(), "%d %d", &x, &y); sscanf(line.c_str(), "%d %d", &x, &y);
if (x < -1) x = -1; if (x > 1) x = 1; if (x < -1) x = -1; if (x > 1) x = 1;
if (y < -1) y = -1; if (y > 1) y = 1; if (y < -1) y = -1; if (y > 1) y = 1;
if (!agent.attack_dir(x, y)) if (!agent->attack_dir(x, y))
bump(); bump();
mask |= 2; mask |= 2;
} else if (!negotiation && !cmd.compare("secrete")) { } else if (!negotiation && !cmd.compare("secrete")) {
@ -165,7 +166,7 @@ bump_negot:
sscanf(line.c_str(), "%d %lf", &id, &v); sscanf(line.c_str(), "%d %lf", &id, &v);
if (id < 0) id = 0; if (id >= PH_COUNT) id = PH_COUNT - 1; if (id < 0) id = 0; if (id >= PH_COUNT) id = PH_COUNT - 1;
if (v < 0) v = 0; if (v < 0) v = 0;
if (!agent.secrete(id, v)) if (!agent->secrete(id, v))
bump(); bump();
/* We deliberately allow multiple secrete commands. */ /* We deliberately allow multiple secrete commands. */
@ -177,10 +178,10 @@ bump_negot:
if (negotiation) { if (negotiation) {
negotiation = false; negotiation = false;
agent.spawn(); agent->spawn();
std::stringstream s; std::stringstream s;
s << "agent_id " << agent.id << "\r\n"; s << "agent_id " << agent->id << "\r\n";
out_buf.append(s.str()); out_buf.append(s.str());
} }

2
connection.h
View file

@ -28,7 +28,7 @@ public:
} }
void senses(int tick_id, class agent &); void senses(int tick_id, class agent &);
void actions(class agent &); void actions(class agent *);
void cancel(void); void cancel(void);