X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fthings.c;h=85503e9a8a874d556ae38a669945e5e819b36870;hb=bf396f111317663bba3950e57968af19f2f56a44;hp=6df9b18efe5fe32ab5bd441ac6e2232032540fcf;hpb=891ba8fbca53d920f6b3704827fa6b8aee737de4;p=plomrogue diff --git a/src/server/things.c b/src/server/things.c index 6df9b18..85503e9 100644 --- a/src/server/things.c +++ b/src/server/things.c @@ -1,21 +1,26 @@ -/* src/server/things.c */ +/* src/server/things.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. + */ #define _POSIX_C_SOURCE 200809L /* strdup() */ #include "things.h" #include /* NULL, size_t */ #include /* uint8_t, uint16_t, int16_t, UINT8_MAX, UINT16_MAX */ #include /* free() */ -#include /* memset(), strcmp(), strdup() */ +#include /* memset(), strcmp(), strdup(), strlen() */ #include "../common/rexit.h" /* exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "../common/yx_uint8.h" /* yx_uint8 */ #include "cleanup.h" /* set_cleanup_flag() */ #include "hardcoded_strings.h" /* s */ -#include "map.h" /* is_passable() */ +#include "field_of_view.h" /* build_fov_map() */ +#include "map.h" /* mv_yx_in_dir_legal() */ #include "rrand.h" /* rrand() */ #include "thing_actions.h" /* actor_wait */ #include "world.h" /* world */ -#include "yx_uint8.h" /* yx_uint8_cmp() */ @@ -28,61 +33,88 @@ struct NextAndId -/* Return lowest unused id for new thing ("sel"==0), thing type ("sel"==1) or - * thing action ("sel"==2). - */ -static uint8_t get_unused_id(uint8_t sel); - /* To linked list of NextAndId structs (or rather structs whose start region is * compatible to it) starting at "start", add newly allocated element of * "n_size" and an ID that is either "id" or, if "id" is <= UINT8_MAX and >= - * "id_start", get ID from get_unused_id("struct_id"). + * "id_start", get lowest ID >= "start_id" and <= UINT8_MAX for new thing + * ("struct_id"=0), thing type ("struct_id"=1) or thing action ("struct_id"=2). */ static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id, int16_t id, uint8_t struct_id, struct NextAndId ** start); +/* Return 1 if cell at "test_pos" is proliferable by "t", i.e. it is passable, + * it is not inhabited by another thing of "t"'s type, and, if "t" is animate, + * neither by any other animate thing; else return 0. + */ +static uint8_t cell_is_proliferable(struct yx_uint8 test_pos, struct Thing * t); -static uint8_t get_unused_id(uint8_t sel) +static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id, + int16_t id, uint8_t struct_id, + struct NextAndId ** start) { - uint8_t i = 0; - while (1) + struct NextAndId * nai = try_malloc(n_size, __func__); + memset(nai, 0, n_size); + if (start_id <= id && id <= UINT8_MAX) { - if ( (0 == sel && !get_thing(world.things, i, 1)) - || (1 == sel && !get_thing_type(i)) - || (2 == sel && !get_thing_action(i))) + nai->id = id; + } + else + { + while (1) { - return i; + if ( (0 == struct_id && !get_thing(world.things, start_id, 1)) + || (1 == struct_id && !get_thing_type(start_id)) + || (2 == struct_id && !get_thing_action(start_id))) + { + nai->id = start_id; + break; + } + char * err = "No unused ID available to add to ID list."; + exit_err(start_id == UINT8_MAX, err); + start_id++; } - exit_err(i == UINT8_MAX, "No unused ID available to add to ID list."); - i++; } + struct NextAndId ** nai_ptr_ptr = start; + for (; * nai_ptr_ptr; nai_ptr_ptr = &(*nai_ptr_ptr)->next); + *nai_ptr_ptr = nai; + return nai; } -static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id, - int16_t id, uint8_t struct_id, - struct NextAndId ** start) +static uint8_t cell_is_proliferable(struct yx_uint8 test_pos, struct Thing * t) { - char * f_name = "add_to_struct_list()"; - struct NextAndId * nai = try_malloc(n_size, f_name); - memset(nai, 0, n_size); - nai->id = (start_id<=id && id<=UINT8_MAX) ? id : get_unused_id(struct_id); - struct NextAndId ** nai_ptr_ptr = start; - for (; NULL != * nai_ptr_ptr; nai_ptr_ptr = &(*nai_ptr_ptr)->next); - *nai_ptr_ptr = nai; - return nai; + if ('.' == world.map.cells[test_pos.y * world.map.length + test_pos.x]) + { + struct Thing * t_test; + for (t_test = world.things; t_test; t_test = t_test->next) + { + if (t_test->pos.y == test_pos.y && t_test->pos.x == test_pos.x) + { + if (t_test->type == t->type) + { + return 0; + } + if (t_test->lifepoints && t->lifepoints) + { + return 0; + } + } + } + return 1; + } + return 0; } -extern struct ThingAction * add_thing_action(int16_t id) +extern struct ThingAction * add_thing_action(uint8_t id) { struct ThingAction * ta; ta = (struct ThingAction *) add_to_struct_list(sizeof(struct ThingAction), - 1, id, 2, + 1, (int16_t) id, 2, (struct NextAndId **) &world.thing_actions); set_cleanup_flag(CLEANUP_THING_ACTIONS); @@ -103,6 +135,7 @@ extern struct ThingType * add_thing_type(int16_t id) &world.thing_types); set_cleanup_flag(CLEANUP_THING_TYPES); tt->name = strdup("(none)"); + tt->corpse_id = tt->id; return tt; } @@ -112,21 +145,38 @@ extern struct Thing * add_thing(int16_t id, uint8_t type, uint8_t y, uint8_t x) { struct Thing * t; t = (struct Thing *) add_to_struct_list(sizeof(struct Thing), 0, id, 0, - (struct NextAndId **) &world.things); + (struct NextAndId **)&world.things); struct ThingType * tt = get_thing_type(type); set_cleanup_flag(CLEANUP_THINGS); t->type = tt->id; t->lifepoints = tt->lifepoints; t->pos.y = y; t->pos.x = x; + if (t->lifepoints && world.exists) + { + build_fov_map(t); + } return t; } +extern void add_thing_to_memory_map(struct Thing * t, uint8_t type, + uint8_t y, uint8_t x) +{ + struct ThingInMemory * tm=try_malloc(sizeof(struct ThingInMemory),__func__); + tm->type = type; + tm->pos.y = y; + tm->pos.x = x; + tm->next = t->t_mem; + t->t_mem = tm; +} + + + extern void free_thing_actions(struct ThingAction * ta) { - if (NULL == ta) + if (!ta) { return; } @@ -139,7 +189,7 @@ extern void free_thing_actions(struct ThingAction * ta) extern void free_thing_types(struct ThingType * tt) { - if (NULL == tt) + if (!tt) { return; } @@ -152,13 +202,16 @@ extern void free_thing_types(struct ThingType * tt) extern void free_things(struct Thing * t) { - if (NULL == t) + if (!t) { return; } free_things(t->owns); free_things(t->next); free(t->fov_map); + free(t->mem_map); + free(t->mem_depth_map); + free_things_in_memory(t->t_mem); free(t); if (t == world.things) /* So add_things()' NULL-delimited thing */ { /* iteration loop does not iterate over */ @@ -168,10 +221,22 @@ extern void free_things(struct Thing * t) +extern void free_things_in_memory(struct ThingInMemory * tm) +{ + if (!tm) + { + return; + } + free_things_in_memory(tm->next); + free(tm); +} + + + extern struct ThingAction * get_thing_action(uint8_t id) { struct ThingAction * ta = world.thing_actions; - for (; NULL != ta && id != ta->id; ta = ta->next); + for (; ta && id != ta->id; ta = ta->next); return ta; } @@ -180,7 +245,7 @@ extern struct ThingAction * get_thing_action(uint8_t id) extern struct ThingType * get_thing_type(uint8_t id) { struct ThingType * tt = world.thing_types; - for (; NULL != tt && id != tt->id; tt = tt->next); + for (; tt && id != tt->id; tt = tt->next); return tt; } @@ -189,7 +254,7 @@ extern struct ThingType * get_thing_type(uint8_t id) extern uint8_t get_thing_action_id_by_name(char * name) { struct ThingAction * ta = world.thing_actions; - while (NULL != ta) + while (ta) { if (0 == strcmp(ta->name, name)) { @@ -210,14 +275,14 @@ extern struct Thing * get_thing(struct Thing * ptr, uint8_t id, uint8_t deep) { while (1) { - if (NULL == ptr || id == ptr->id) + if (!ptr || id == ptr->id) { return ptr; } if (deep) { struct Thing * owned_thing = get_thing(ptr->owns, id, 1); - if (NULL != owned_thing) + if (owned_thing) { return ptr; } @@ -235,6 +300,39 @@ extern struct Thing * get_player() +extern void try_thing_proliferation(struct Thing * t) +{ + struct ThingType * tt = get_thing_type(t->type); + if (tt->proliferate) + { + if (1 == tt->proliferate || 1 == (rrand() % tt->proliferate)) + { + struct yx_uint8 candidates[6]; + uint8_t n_candidates = 0; + char dirs[7] = "dxswed"; + struct yx_uint8 test = t->pos; + uint8_t i; + for (i = 0; i < strlen(dirs); i++) + { + if ( mv_yx_in_dir_legal(dirs[i], &test) + && cell_is_proliferable(test, t)) + { + candidates[n_candidates] = test; + n_candidates++; + } + } + if (!n_candidates) + { + return; + } + i = rrand() % n_candidates; + add_thing(-1, tt->id, candidates[i].y, candidates[i].x); + } + } +} + + + extern void add_things(uint8_t type, uint8_t n) { uint8_t i; @@ -243,10 +341,11 @@ extern void add_things(uint8_t type, uint8_t n) struct yx_uint8 pos; while (1) { - char * err = "Space to put thing on too hard to find." - "Map too small?"; + char * err="Space to put thing on too hard to find. Map too small?"; uint16_t i_pos = 0; - for (pos.y = pos.x = 0; 0 == is_passable(pos); i_pos++) + for (pos.y = pos.x = 0; + '.' != world.map.cells[pos.y * world.map.length + pos.x]; + i_pos++) { exit_err(UINT16_MAX == i_pos, err); pos.y = rrand() % world.map.length; @@ -256,7 +355,7 @@ extern void add_things(uint8_t type, uint8_t n) uint8_t clear = 1; for (t = world.things; t; t = t->next) { - if (yx_uint8_cmp(&pos, &t->pos) && 0 != t->lifepoints) + if (0 != t->lifepoints && pos.y==t->pos.y && pos.x==t->pos.x) { clear = 0; break; @@ -297,7 +396,7 @@ extern void own_thing(struct Thing ** target, struct Thing ** source, penult->next = t->next; } struct Thing ** t_ptr_ptr = target; - for (; NULL != * t_ptr_ptr; t_ptr_ptr = &(*t_ptr_ptr)->next); + for (; * t_ptr_ptr; t_ptr_ptr = &(*t_ptr_ptr)->next); * t_ptr_ptr = t; t->next = NULL; } @@ -308,5 +407,5 @@ extern void set_thing_position(struct Thing * t, struct yx_uint8 pos) { t->pos = pos; struct Thing * owned = t->owns; - for (; owned != NULL; set_thing_position(owned, pos), owned = owned->next); + for (; owned; set_thing_position(owned, pos), owned = owned->next); }