X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap_object_actions.c;h=6c92d07577eaade92234e042b2d64beb0d3c572e;hb=7433f56ec2c6cc51bc497e3c0c67d2fe3e6ab64a;hp=f7bdcb4c0fd88d99ebd26ae65d64d6ac2c59d0d1;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue diff --git a/src/server/map_object_actions.c b/src/server/map_object_actions.c index f7bdcb4..6c92d07 100644 --- a/src/server/map_object_actions.c +++ b/src/server/map_object_actions.c @@ -1,23 +1,21 @@ /* src/server/map_object_actions.c */ #include "map_object_actions.h" +#include /* NULL */ #include /* uint8_t, uint16_t */ #include /* sprintf() */ -#include /* free(), atoi() */ -#include /* strlen(), strcmp(), memcpy(), strtok(), strncmp() */ -#include "../common/readwrite.h" /* textfile_sizes(), try_fopen(), try_fclose(), - * try_fgets() - */ +#include /* free() */ +#include /* strlen(), strcmp(), memcpy(), strncmp() */ #include "../common/rexit.h" /* exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "../common/yx_uint16.h" /* yx_uint16 struct */ -#include "cleanup.h" /* set_cleanup_flag() */ +#include "../common/yx_uint8.h" /* struct yx_uint8 */ +#include "field_of_view.h" /* build_fov_map() */ #include "map_objects.h" /* structs MapObj, MapObjDef, get_player(), * set_object_position(), own_map_object(), * get_map_object_def() */ #include "map.h" /* is_passable() */ -#include "yx_uint16.h" /* mv_yx_in_dir(), yx_uint16_cmp() */ +#include "yx_uint8.h" /* mv_yx_in_dir(), yx_uint8_cmp() */ #include "world.h" /* global world */ @@ -25,10 +23,6 @@ /* Append "text" to game log, or a "." if "text" is the same as the last one. */ static void update_log(char * text); -/* If "name" fits "moa"->name, set "moa"->func to "func". */ -static uint8_t try_func_name(struct MapObjAct * moa, - char * name, void (* func) (struct MapObj *)); - /* One actor "wounds" another actor, decrementing his lifepoints and, if they * reach zero in the process, killing it. Generates appropriate log message. */ @@ -36,8 +30,10 @@ static void actor_hits_actor(struct MapObj * hitter, struct MapObj * hitted); /* Bonus stuff to actor_*() to happen if actor==player. Mostly writing of log * messages; _pick and _drop also decrement world.inventory_sel by 1 if >0. + * (match_dir() is just a little helper to playerbonus_move().) */ static void playerbonus_wait(); +static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match); static void playerbonus_move(char d, uint8_t passable); static void playerbonus_drop(uint8_t owns_none); static void playerbonus_pick(uint8_t picked); @@ -71,7 +67,7 @@ static void update_log(char * text) } last_stop--; } - if ( (last_stop + 1) - last_nl == strlen(text) + if ( (last_stop + 1) - last_nl == (uint16_t) strlen(text) && 0 == strncmp(world.log + last_nl, text, strlen(text))) { text = "."; @@ -87,19 +83,6 @@ static void update_log(char * text) -static uint8_t try_func_name(struct MapObjAct * moa, - char * name, void (* func) (struct MapObj *)) -{ - if (0 == strcmp(moa->name, name)) - { - moa->func = func; - return 1; - } - return 0; -} - - - static void actor_hits_actor(struct MapObj * hitter, struct MapObj * hitted) { struct MapObjDef * mod_hitter = get_map_object_def(hitter->type); @@ -131,10 +114,6 @@ static void actor_hits_actor(struct MapObj * hitter, struct MapObj * hitted) return; } update_log(" It dies."); - if (player == hitter) - { - world.score = world.score + mod_hitted->lifepoints; - } } } @@ -147,20 +126,28 @@ static void playerbonus_wait() -static void playerbonus_move(char d, uint8_t passable) +static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match) { - char * dsc_dir = "north"; - if ('E' == d) + if (d == match) { - dsc_dir = "east" ; - } - else if ('S' == d) - { - dsc_dir = "south"; + * dsc_d = dsc_match; + return 1; } - else if ('W' == d) + return 0; +} + + + +static void playerbonus_move(char d, uint8_t passable) +{ + char * dsc_dir = "north-east"; + if ( match_dir(d, &dsc_dir, 'd', "east") + || match_dir(d, &dsc_dir, 'c', "south-east") + || match_dir(d, &dsc_dir, 'x', "south-west") + || match_dir(d, &dsc_dir, 's', "west") + || match_dir(d, &dsc_dir, 'w', "north-west")) { - dsc_dir = "west" ; + ; } char * dsc_move = "You move "; if (0 == passable) @@ -215,44 +202,6 @@ static void playerbonus_use(uint8_t no_object, uint8_t wrong_object) -extern void init_map_object_actions(char * path) -{ - char * f_name = "init_map_object_actions()"; - FILE * file = try_fopen(path, "r", f_name); - uint16_t linemax = textfile_sizes(file, NULL); - char line[linemax + 1]; - struct MapObjAct ** moa_ptr_ptr = &world.map_obj_acts; - char * delim = " "; - while (try_fgets(line, linemax + 1, file, f_name)) - { - if ('\n' == line[0] || 0 == line[0]) - { - break; - } - struct MapObjAct * moa = try_malloc(sizeof(struct MapObjAct), f_name); - moa->id = atoi(strtok(line, delim)); - moa->effort = atoi(strtok(NULL, delim)); - char * funcname = strtok(NULL, "\n"); - uint8_t len_name = strlen(funcname) + 1; - moa->name = try_malloc(len_name, f_name); - memcpy(moa->name, funcname, len_name); - if (!( try_func_name(moa, "move", actor_move) - || try_func_name(moa, "pick_up", actor_pick) - || try_func_name(moa, "drop", actor_drop) - || try_func_name(moa, "use", actor_use))) - { - moa->func = actor_wait; - } - moa->next = NULL; - * moa_ptr_ptr = moa; - moa_ptr_ptr = &moa->next; - } - try_fclose(file, f_name); - set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS); -} - - - extern void free_map_object_actions(struct MapObjAct * moa) { if (NULL == moa) @@ -277,7 +226,7 @@ extern uint8_t get_moa_id_by_name(char * name) } moa = moa->next; } - exit_err(NULL == moa, "get_moa_id_name() did not find map object action."); + exit_err(NULL==moa, "get_moa_id_by_name() did not find map object action."); return moa->id; } @@ -296,7 +245,7 @@ extern void actor_wait(struct MapObj * mo) extern void actor_move(struct MapObj * mo) { char d = mo->arg; - struct yx_uint16 target = mv_yx_in_dir(d, mo->pos); + struct yx_uint8 target = mv_yx_in_dir(d, mo->pos); struct MapObj * other_mo; for (other_mo = world.map_objs; other_mo != 0; other_mo = other_mo->next) { @@ -304,7 +253,7 @@ extern void actor_move(struct MapObj * mo) { continue; } - if (yx_uint16_cmp(&target, &other_mo->pos)) + if (yx_uint8_cmp(&target, &other_mo->pos)) { actor_hits_actor(mo, other_mo); return; @@ -314,6 +263,8 @@ extern void actor_move(struct MapObj * mo) if (passable) { set_object_position(mo, target); + free(mo->fov_map); + mo->fov_map = build_fov_map(mo); } if (mo == get_player()) { @@ -344,12 +295,13 @@ extern void actor_drop(struct MapObj * mo) extern void actor_pick(struct MapObj * mo) { - struct MapObj * picked; - for (picked = world.map_objs; NULL != picked; picked = picked->next) + struct MapObj * picked = NULL; + struct MapObj * mo_i; + for (mo_i = world.map_objs; NULL != mo_i; mo_i = mo_i->next) { - if (picked != mo && yx_uint16_cmp(&picked->pos, &mo->pos)) + if (mo_i != mo && yx_uint8_cmp(&mo_i->pos, &mo->pos)) { - break; + picked = mo_i; } } if (NULL != picked) @@ -376,7 +328,7 @@ extern void actor_use(struct MapObj * mo) struct MapObj * selected = mo->owns; for (; i != select; i++, selected = selected->next); struct MapObjDef * mod = get_map_object_def(selected->type); - if (!strcmp("MAGIC MEAT", mod->name)) + if (mod->consumable) { wrong_object = 0; struct MapObj * next = selected->next; @@ -392,7 +344,7 @@ extern void actor_use(struct MapObj * mo) { mo->owns = next; } - mo->lifepoints++; + mo->lifepoints = mo->lifepoints + mod->consumable; } } if (mo == get_player())