X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=ec713ae5bd02dc2e9dac915c48066e154812b151;hb=491e8bc8e7a9b1d312256817c0b8be7e05b127be;hp=8d6a802417ea6df95068892fe3b89b77cad7057f;hpb=fa0c416ccad4c4278813909ca1b799cd0600840c;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 8d6a802..ec713ae 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -142,8 +142,16 @@ static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted)
if (player == hitted)
{
update_log(" You die.");
+ memset(hitted->fov_map, ' ', world.map.length * world.map.length);
return;
}
+ else
+ {
+ free(hitted->fov_map);
+ hitted->fov_map = NULL;
+ free(hitted->mem_map);
+ hitted->mem_map = NULL;
+ }
update_log(" It dies.");
}
}
@@ -278,7 +286,7 @@ extern void actor_move(struct Thing * t)
extern void actor_drop(struct Thing * t)
{
- uint8_t owns_none = (NULL == t->owns);
+ uint8_t owns_none = (!t->owns);
if (!owns_none)
{
uint8_t select = t->arg;
@@ -299,21 +307,21 @@ extern void actor_pick(struct Thing * t)
{
struct Thing * picked = NULL;
struct Thing * t_i;
- for (t_i = world.things; NULL != t_i; t_i = t_i->next)
+ for (t_i = world.things; t_i; t_i = t_i->next)
{
if (t_i != t && yx_uint8_cmp(&t_i->pos, &t->pos))
{
picked = t_i;
}
}
- if (NULL != picked)
+ if (picked)
{
own_thing(&t->owns, &world.things, picked->id);
set_thing_position(picked, t->pos);
}
if (t == get_player())
{
- playerbonus_pick(NULL != picked);
+ playerbonus_pick(!(!picked));
}
}
@@ -322,7 +330,7 @@ extern void actor_pick(struct Thing * t)
extern void actor_use(struct Thing * t)
{
uint8_t wrong_thing = 1;
- uint8_t no_thing = (NULL == t->owns);
+ uint8_t no_thing = (!t->owns);
if (!no_thing)
{
uint8_t select = t->arg;