X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=627235c7b04728adc0b47ea90ec9c9ade9da26ec;hb=9f1f36adb18c45b1b834162b0f23b2847627e538;hp=e91f576aa3ebfd5ed84fbb296c2ba100f0f4d574;hpb=891ba8fbca53d920f6b3704827fa6b8aee737de4;p=plomrogue diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c index e91f576..627235c 100644 --- a/src/server/thing_actions.c +++ b/src/server/thing_actions.c @@ -12,10 +12,11 @@ #include "field_of_view.h" /* build_fov_map() */ #include "hardcoded_strings.h" /* s */ #include "things.h" /* Thing, ThingType, get_player(), own_thing(), - * set_thing_position(), get_thing_type() + * set_thing_position(), get_thing_type(), + * free_things_in_memory() */ -#include "map.h" /* is_passable() */ -#include "yx_uint8.h" /* mv_yx_in_dir(), yx_uint8_cmp() */ +#include "map.h" /* mv_yx_in_dir_legal() */ +#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */ #include "world.h" /* global world */ @@ -85,7 +86,6 @@ static uint8_t text_equals_log_end(char * log, char * text) static void update_log(char * text) { - char * f_name = "update_log()"; uint16_t len_new = strlen(text); uint16_t len_old = 0; uint16_t offset = 0; @@ -103,10 +103,10 @@ static void update_log(char * text) } } uint16_t len_whole = len_old + len_new + 1; - char * new_text = try_malloc(len_whole, f_name); + char * new_text = try_malloc(len_whole, __func__); memcpy(new_text, world.log + offset, len_old); int test = sprintf(new_text + len_old, "%s", text); - exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]); + exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]); free(world.log); world.log = new_text; } @@ -115,7 +115,6 @@ static void update_log(char * text) static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted) { - char * f_name = "actor_hits_actor()"; struct ThingType * tt_hitter = get_thing_type(hitter->type); struct ThingType * tt_hitted = get_thing_type(hitted->type); struct Thing * player = get_player(); @@ -132,9 +131,9 @@ static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted) msg3 = tt_hitted->name; } uint8_t len = 1 + strlen(msg1) + 1 + strlen(msg2) + 1 + strlen(msg3) + 2; - char * msg = try_malloc(len, f_name); + char * msg = try_malloc(len, __func__); int test = sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3); - exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]); + exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]); update_log(msg); free(msg); hitted->lifepoints--; @@ -144,8 +143,18 @@ 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; + free_things_in_memory(hitted->t_mem); + hitted->t_mem = NULL; + } update_log(" It dies."); } } @@ -173,7 +182,6 @@ static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match) static void playerbonus_move(char d, uint8_t passable) { - char * f_name = "playerbonus_move()"; char * dsc_dir = "north-east"; if ( match_dir(d, &dsc_dir, 'd', "east") || match_dir(d, &dsc_dir, 'c', "south-east") @@ -188,9 +196,9 @@ static void playerbonus_move(char d, uint8_t passable) { dsc_move = "You fail to move "; } - char * msg = try_malloc(strlen(dsc_move) + strlen (dsc_dir) + 3, f_name); + char * msg = try_malloc(strlen(dsc_move) + strlen (dsc_dir) + 3, __func__); int test = sprintf(msg, "\n%s%s.", dsc_move, dsc_dir); - exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]); + exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]); update_log(msg); free(msg); } @@ -251,26 +259,31 @@ extern void actor_wait(struct Thing * t) extern void actor_move(struct Thing * t) { char d = t->arg; - struct yx_uint8 target = mv_yx_in_dir(d, t->pos); struct Thing * other_t; - for (other_t = world.things; other_t != 0; other_t = other_t->next) + struct yx_uint8 target = t->pos; + uint8_t legal_move = mv_yx_in_dir_legal(d, &target); + mv_yx_in_dir_wrap(0, NULL, 1); + if (legal_move) { - if (0 == other_t->lifepoints || other_t == t) + for (other_t = world.things; other_t != 0; other_t = other_t->next) { - continue; - } - if (yx_uint8_cmp(&target, &other_t->pos)) - { - actor_hits_actor(t, other_t); - return; + if (0 == other_t->lifepoints || other_t == t) + { + continue; + } + if (target.y == other_t->pos.y && target.x == other_t->pos.x) + { + actor_hits_actor(t, other_t); + return; + } } } - uint8_t passable = is_passable(target); + char target_cell = world.map.cells[target.y * world.map.length + target.x]; + uint8_t passable = legal_move && '.' == target_cell; if (passable) { set_thing_position(t, target); - free(t->fov_map); - t->fov_map = build_fov_map(t); + build_fov_map(t); } if (t == get_player()) { @@ -282,7 +295,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; @@ -303,21 +316,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)) + if (t_i != t && t_i->pos.y == t->pos.y && t_i->pos.x == t->pos.x) { 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)); } } @@ -326,7 +339,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;