X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=42b77dcabdedf1e4f0905e8304411fe40d78882b;hb=9ee3279f2caf89f2fdade2839840d2a07e86d50d;hp=e4e5276ad84ee27087ea42a8b1a15efda0f97d59;hpb=d92f16d5959fc846d3eaf669517eecb3969cda08;p=plomrogue diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c index e4e5276..42b77dc 100644 --- a/src/server/thing_actions.c +++ b/src/server/thing_actions.c @@ -1,25 +1,42 @@ -/* src/server/thing_actions.c */ +/* src/server/thing_actions.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. + */ #include "thing_actions.h" #include /* NULL */ #include /* uint8_t, uint16_t */ #include /* sprintf() */ #include /* free() */ -#include /* strlen(), strcmp(), memcpy(), strncmp() */ -#include "../common/rexit.h" /* exit_err() */ +#include /* strlen(), memcpy(), strncmp() */ +#include "../common/rexit.h" /* exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "../common/yx_uint8.h" /* struct yx_uint8 */ +#include "../common/yx_uint8.h" /* yx_uint8 */ #include "field_of_view.h" /* build_fov_map() */ -#include "things.h" /* structs Thing, ThingType, get_player(), own_thing(), - * set_thing_position(), get_thing_type() +#include "hardcoded_strings.h" /* s */ +#include "things.h" /* Thing, ThingType, get_player(), own_thing(), + * 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 "world.h" /* global world */ -/* Append "text" to game log, or a "." if "text" is the same as the last one. */ +/* How many previous characters of the game log to keep on adding new text */ +#define MAX_BACKLOG_CHARS 3000 + + + +/* If "text" is equal "log"'s last line, return 1, else 0. */ +static uint8_t text_equals_log_end(char * log, char * text); + +/* Append "text" to game log shortened to MAX_BACKLOG_CHARS characters, or + * continuation period if "text" is the same as the (shortened) log's last line + * minus continuation periods. + */ static void update_log(char * text); /* One actor "wounds" another actor, decrementing his lifepoints and, if they @@ -40,42 +57,60 @@ static void playerbonus_use(uint8_t no_thing, uint8_t wrong_thing); +static uint8_t text_equals_log_end(char * log, char * text) +{ + uint16_t len_old = strlen(log); + uint16_t last_nl = len_old - 1; + while (last_nl != 0) + { + if ('\n' == log[last_nl]) + { + break; + } + last_nl--; + } + uint16_t last_stop = len_old - 1; + while (last_stop != 0) + { + if ('.' == log[last_stop] && '.' != log[last_stop - 1]) + { + break; + } + last_stop--; + } + if ( (last_stop + 1) - last_nl == (uint16_t) strlen(text) + && 0 == strncmp(log + last_nl, text, strlen(text))) + { + return 1; + } + return 0; +} + + + 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; if (world.log) { len_old = strlen(world.log); - uint16_t last_nl = len_old - 1; - while (last_nl != 0) + if (len_old > MAX_BACKLOG_CHARS) { - if ('\n' == world.log[last_nl]) - { - break; - } - last_nl--; + offset = len_old - MAX_BACKLOG_CHARS; + len_old = MAX_BACKLOG_CHARS; } - uint16_t last_stop = len_old - 1; - while (last_stop != 0) - { - if ('.' == world.log[last_stop] && '.' != world.log[last_stop - 1]) - { - break; - } - last_stop--; - } - if ( (last_stop + 1) - last_nl == (uint16_t) strlen(text) - && 0 == strncmp(world.log + last_nl, text, strlen(text))) + if (text_equals_log_end(world.log + offset, text)) { text = "."; } } uint16_t len_whole = len_old + len_new + 1; - char * new_text = try_malloc(len_whole, f_name); - memcpy(new_text, world.log, len_old); - sprintf(new_text + len_old, "%s", text); + 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, __func__, s[S_FCN_SPRINTF]); free(world.log); world.log = new_text; } @@ -100,9 +135,11 @@ 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[len]; - sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3); + char * msg = try_malloc(len, __func__); + int test = sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3); + exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]); update_log(msg); + free(msg); hitted->lifepoints--; if (0 == hitted->lifepoints) { @@ -110,8 +147,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."); } } @@ -153,9 +200,11 @@ static void playerbonus_move(char d, uint8_t passable) { dsc_move = "You fail to move "; } - char msg[strlen(dsc_move) + strlen (dsc_dir) + 3]; - sprintf(msg, "\n%s%s.", dsc_move, dsc_dir); + 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, __func__, s[S_FCN_SPRINTF]); update_log(msg); + free(msg); } @@ -201,36 +250,6 @@ static void playerbonus_use(uint8_t no_thing, uint8_t wrong_thing) -extern void free_thing_actions(struct ThingAction * ta) -{ - if (NULL == ta) - { - return; - } - free(ta->name); - free_thing_actions(ta->next); - free(ta); -} - - - -extern uint8_t get_thing_action_id_by_name(char * name) -{ - struct ThingAction * ta = world.thing_actions; - while (NULL != ta) - { - if (0 == strcmp(ta->name, name)) - { - break; - } - ta = ta->next; - } - exit_err(NULL == ta, "get_thing_action_id_by_name() did not find action."); - return ta->id; -} - - - extern void actor_wait(struct Thing * t) { if (t == get_player()) @@ -244,26 +263,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_legal(0, NULL); + uint8_t passable = 0; + if (legal_move) { - if (0 == other_t->lifepoints || other_t == t) - { - continue; - } - if (yx_uint8_cmp(&target, &other_t->pos)) + passable = '.' == world.map.cells[target.y*world.map.length + target.x]; + for (other_t = world.things; other_t != 0; other_t = other_t->next) { - 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); 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()) { @@ -275,7 +299,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; @@ -296,21 +320,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)); } } @@ -319,7 +343,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;