err_line(1, "No thing type defined to manipulate yet.");
return 1;
}
- uint8_t id;
+ int16_t id;
if ( parse_val(tok0,tok1,s[S_CMD_TT_CONSUM],'8',(char *) &tt->consumable)
|| parse_val(tok0,tok1,s[S_CMD_TT_HP],'8',(char *) &tt->lifepoints)
|| parse_val(tok0,tok1,s[S_CMD_TT_STARTN],'8',(char *) &tt->start_n)
}
tt->corpse_id = id;
}
- else if (parse_val(tok0, tok1, s[S_CMD_THINGTYPE], '8', (char *) &id))
+ else if (parse_val(tok0, tok1, s[S_CMD_TT_ID], 'i', (char *) &id))
{
tt = get_thing_type(id);
if (!tt)
err_line(1, "No thing action defined to manipulate yet.");
return 1;
}
- uint8_t id;
+ int16_t id;
if (parse_val(tok0, tok1, s[S_CMD_TA_EFFORT],'8',(char *)&ta->effort));
else if (parse_val(tok0, tok1, s[S_CMD_TA_NAME], 's', (char *)&ta->name))
{
}
}
}
- else if (parse_val(tok0, tok1, s[S_CMD_THINGACTION], '8', (char *) &id))
+ else if (parse_val(tok0, tok1, s[S_CMD_TA_ID], '8', (char *) &id))
{
ta = get_thing_action(id);
if (!ta)
{
t->pos.x = length;
}
- free(t->fov_map);
if (world.exists && t->lifepoints)
{
- t->fov_map = build_fov_map(t);
+ build_fov_map(t);
}
}
return 1;
err_line(1, "No thing defined to manipulate yet.");
return 1;
}
- uint8_t id;
- if ( parse_thing_type(tok0, tok1, t)
+ int16_t id;
+ if ( parse_thing_type(tok0, tok1, t)
|| parse_thing_command(tok0, tok1, t)
|| parse_val(tok0,tok1, s[S_CMD_T_ARGUMENT], '8', (char *)&t->arg)
|| parse_val(tok0,tok1, s[S_CMD_T_PROGRESS], '8', (char *)&t->progress)
|| parse_val(tok0,tok1, s[S_CMD_T_HP], '8', (char *) &t->lifepoints)
|| parse_position(tok0, tok1, t)
|| parse_carry(tok0, tok1, t));
- else if (parse_val(tok0, tok1, s[S_CMD_THING], 'i', (char *) &id))
+ else if (parse_val(tok0, tok1, s[S_CMD_T_ID], 'i', (char *) &id))
{
t = get_thing(world.things, id, 1);
char * err = "No thing type found to initialize new thing.";
t = add_thing(id, world.thing_types->id, 0, 0);
if (world.exists && t->lifepoints)
{
- t->fov_map = build_fov_map(t);
+ build_fov_map(t);
}
}
}
{
if (ti->lifepoints)
{
- if (ti->fov_map)
- {
- free(ti->fov_map);
- }
- ti->fov_map = build_fov_map(ti);
+ build_fov_map(ti);
}
}
world.exists = 1;