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

connnection::senses(): Sanitize interface, take just agent&

Browse source
This commit is contained in:
Petr Baudis 2011-11-27 03:24:40 +01:00
parent 9dcb3c543a
commit 415475cd26
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
agent.cc
View file

@ -83,17 +83,7 @@ agent::on_senses_update(void)
if (!conn) if (!conn)
return; return;
char around[8] = { conn->senses(tick_id, *this);
tile->tile_in_dir(0, -1).symbol(),
tile->tile_in_dir(1, -1).symbol(),
tile->tile_in_dir(1, 0).symbol(),
tile->tile_in_dir(1, 1).symbol(),
tile->tile_in_dir(0, 1).symbol(),
tile->tile_in_dir(-1, 1).symbol(),
tile->tile_in_dir(-1, 0).symbol(),
tile->tile_in_dir(-1, -1).symbol(),
};
conn->senses(tick_id, dead, energy, around);
} }
agent::~agent() agent::~agent()

21
connection.cc
View file

@ -11,10 +11,27 @@
#include "connection.h" #include "connection.h"
void void
connection::senses(int tick_id, bool dead, int energy, char around[4]) connection::senses(int tick_id, class agent &a)
{ {
char buf[1024]; char buf[1024];
snprintf(buf, sizeof(buf), "tick %d\r\n%senergy %d\r\naround %.8s\r\n\r\n", tick_id, dead ? "DEAD\r\n" : "", energy, around); snprintf(buf, sizeof(buf),
"tick %d\r\n"
"%s"
"energy %d\r\n"
"around %c%c%c%c%c%c%c%c\r\n"
"\r\n",
tick_id,
a.dead ? "DEAD\r\n" : "",
a.energy,
a.tile->tile_in_dir(0, -1).symbol(),
a.tile->tile_in_dir(1, -1).symbol(),
a.tile->tile_in_dir(1, 0).symbol(),
a.tile->tile_in_dir(1, 1).symbol(),
a.tile->tile_in_dir(0, 1).symbol(),
a.tile->tile_in_dir(-1, 1).symbol(),
a.tile->tile_in_dir(-1, 0).symbol(),
a.tile->tile_in_dir(-1, -1).symbol()
);
pthread_mutex_lock(&buf_lock); pthread_mutex_lock(&buf_lock);
out_buf.append(buf); out_buf.append(buf);

2
connection.h
View file

@ -26,7 +26,7 @@ public:
close(fd); close(fd);
} }
void senses(int tick_id, bool dead, int energy, char around[8]); void senses(int tick_id, class agent &);
void actions(class agent *); void actions(class agent *);
void cancel(void); void cancel(void);