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

agent::spawn_at(): Disassociate from constructor, allow tile == NULL

Browse source
This commit is contained in:
Petr Baudis 2011-11-27 04:28:16 +01:00
parent 3e5366a5c4
commit 7714906baa
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
agent.cc
View file

@ -8,8 +8,9 @@
#include "map.h"
void
agent::put_at(class tile &t)
agent::spawn_at(class tile &t)
{
tile = &t;
if (!t.on_agent_enter(*this)) {
std::cerr << "Collision.";
exit(EXIT_FAILURE);
@ -19,7 +20,7 @@ agent::put_at(class tile &t)
bool
agent::move_dir(int dir_x, int dir_y)
{
if (dead)
if (dead || !tile)
return false;
chenergy(world::move_cost);
@ -48,7 +49,7 @@ agent::move_dir(int dir_x, int dir_y)
bool
agent::attack_dir(int dir_x, int dir_y)
{
if (dead)
if (dead || !tile)
return false;
class tile *t2 = &tile->tile_in_dir(dir_x, dir_y);
@ -112,7 +113,7 @@ agent::on_tick(void)
void
agent::on_senses_update(void)
{
if (!conn)
if (!conn || !tile)
return;
conn->senses(tick_id, *this);
@ -120,7 +121,8 @@ agent::on_senses_update(void)
agent::~agent()
{
tile->on_agent_leave(*this);
if (tile)
tile->on_agent_leave(*this);
if (conn) {
conn->cancel();
conn = NULL;