#include "map_object_actions.h"
#include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, UINT8_MAx */
-#include <stdio.h> /* sprintf(), ungetc() */
-#include <stdlib.h> /* free(), atoi() */
+#include <stdint.h> /* uint8_t, uint16_t */
+#include <stdio.h> /* sprintf() */
+#include <stdlib.h> /* free() */
#include <string.h> /* 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_sizes(), 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_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 */
/* 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.
*/
}
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 = ".";
-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);
return;
}
update_log(" It dies.");
- if (player == hitter)
- {
- world.score = world.score + mod_hitted->lifepoints;
- }
}
}
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)
{
-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);
- uint16_t linemax = textfile_sizes(file, NULL);
- 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)
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)
{
{
continue;
}
- if (yx_uint16_cmp(&target, &other_mo->pos))
+ if (yx_uint8_cmp(&target, &other_mo->pos))
{
actor_hits_actor(mo, other_mo);
return;
if (passable)
{
set_object_position(mo, target);
+ free(mo->fov_map);
+ mo->fov_map = build_fov_map(mo);
}
if (mo == get_player())
{
struct MapObj * mo_i;
for (mo_i = world.map_objs; NULL != mo_i; mo_i = mo_i->next)
{
- if (mo_i != mo && yx_uint16_cmp(&mo_i->pos, &mo->pos))
+ if (mo_i != mo && yx_uint8_cmp(&mo_i->pos, &mo->pos))
{
picked = mo_i;
}
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;
{
mo->owns = next;
}
- mo->lifepoints++;
+ mo->lifepoints = mo->lifepoints + mod->consumable;
}
}
if (mo == get_player())