X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fmap_object_actions.c;h=6c92d07577eaade92234e042b2d64beb0d3c572e;hb=273161a3d8956e98308a79169dcf7c70a89992fe;hp=cd233c93940f5f0a06220c914e512844df8385f1;hpb=784a54c9ef27aa2bf0754b2761aee06cbbde270e;p=plomrogue
diff --git a/src/server/map_object_actions.c b/src/server/map_object_actions.c
index cd233c9..6c92d07 100644
--- a/src/server/map_object_actions.c
+++ b/src/server/map_object_actions.c
@@ -3,14 +3,13 @@
#include "map_object_actions.h"
#include /* NULL */
#include /* uint8_t, uint16_t */
-#include /* sprintf(), ungetc() */
-#include /* free(), atoi() */
+#include /* sprintf() */
+#include /* free() */
#include /* strlen(), strcmp(), memcpy(), strncmp() */
-#include "../common/err_try_fgets.h" /* err_try_fgets() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
-#include "io.h" /* struct EntrySkeleton */
+#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()
@@ -24,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.
*/
@@ -88,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);
@@ -158,14 +140,12 @@ 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"))
{
;
}
@@ -222,29 +202,6 @@ static void playerbonus_use(uint8_t no_object, uint8_t wrong_object)
-extern void read_map_object_action(char * line, uint32_t linemax,char * context,
- struct EntrySkeleton * entry, FILE * file)
-{
- char * f_name = "init_map_object_actions()";
- struct MapObjAct * moa = (struct MapObjAct *) entry;
- err_try_fgets(line, linemax, file, context, "0nfi8");
- 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;
- }
-}
-
-
-
extern void free_map_object_actions(struct MapObjAct * moa)
{
if (NULL == moa)
@@ -306,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())
{