X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmap_object_actions.c;h=6c92d07577eaade92234e042b2d64beb0d3c572e;hb=7433f56ec2c6cc51bc497e3c0c67d2fe3e6ab64a;hp=c3ffaf1e287b71580ec3e55effca07ec01a78d10;hpb=eb96a1dfe83cef7f3d1c0c73e03b915caca09db8;p=plomrogue
diff --git a/src/server/map_object_actions.c b/src/server/map_object_actions.c
index c3ffaf1..6c92d07 100644
--- a/src/server/map_object_actions.c
+++ b/src/server/map_object_actions.c
@@ -2,20 +2,14 @@
#include "map_object_actions.h"
#include /* NULL */
-#include /* uint8_t, uint16_t, UINT8_MAx */
-#include /* sprintf(), ungetc() */
-#include /* free(), atoi() */
+#include /* uint8_t, uint16_t */
+#include /* sprintf() */
+#include /* free() */
#include /* strlen(), strcmp(), memcpy(), strncmp() */
-#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line(),
- * reset_err_try_fgets_counter()
- */
-#include "../common/readwrite.h" /* textfile_width(), try_fopen(), try_fclose(),
- * try_fgetc()
- */
-#include "../common/rexit.h" /* exit_err(), exit_trouble() */
+#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
-#include "cleanup.h" /* set_cleanup_flag() */
+#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()
@@ -29,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.
*/
@@ -77,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 = ".";
@@ -93,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);
@@ -163,14 +140,15 @@ 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 * dsc_dir = "north";
- if ( match_dir(d, &dsc_dir, '6', "east")
- || match_dir(d, &dsc_dir, '2', "south")
- || match_dir(d, &dsc_dir, '4', "west")
- || match_dir(d, &dsc_dir, '7', "north-west")
- || match_dir(d, &dsc_dir, '9', "north-east")
- || match_dir(d, &dsc_dir, '1', "south-west")
- || match_dir(d, &dsc_dir, '3', "south-east"));
+ 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"))
+ {
+ ;
+ }
char * dsc_move = "You move ";
if (0 == passable)
{
@@ -224,60 +202,6 @@ static void playerbonus_use(uint8_t no_object, uint8_t wrong_object)
-extern void init_map_object_actions()
-{
- char * f_name = "init_map_object_actions()";
- FILE * file = try_fopen(world.path_map_obj_acts, "r", f_name);
- uint32_t linemax = textfile_width(file);
- char line[linemax + 1];
- struct MapObjAct ** moa_ptr_ptr = &world.map_obj_acts;
- char * context = "Failed reading map object actions config file. ";
- char * err_toolarge = "Value is too large.";
- char * err_uniq = "Declaration of ID already used.";
- reset_err_try_fgets_counter();
- while (1)
- {
- int test_for_end = try_fgetc(file, f_name);
- if (EOF == test_for_end || '\n' == test_for_end)
- {
- break;
- }
- exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
- struct MapObjAct * moa = try_malloc(sizeof(struct MapObjAct), f_name);
- err_try_fgets(line, linemax, file, context, "nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- moa->id = atoi(line);
- struct MapObjAct * moa_test = world.map_obj_acts;
- for (; NULL != moa_test; moa_test = moa_test->next)
- {
- err_line(moa->id == moa_test->id, line, context, err_uniq);
- }
- err_try_fgets(line, linemax, file, context, "0nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- moa->effort = atoi(line);
- err_try_fgets(line, linemax, file, context, "0nf");
- line[strlen(line) - 1] = '\0';
- uint8_t len_name = strlen(line) + 1;
- moa->name = try_malloc(len_name, f_name);
- memcpy(moa->name, line, 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;
- err_try_fgets(line, linemax, file, context, "d");
- }
- try_fclose(file, f_name);
- set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS);
-}
-
-
-
extern void free_map_object_actions(struct MapObjAct * moa)
{
if (NULL == moa)
@@ -339,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())
{
@@ -402,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;
@@ -418,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())