#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* unset_cleanup_flag() */
-#include "field_of_view.h" /* build_fov_map() */
+#include "field_of_view.h" /* build_fov_map(), update_map_memory() */
#include "hardcoded_strings.h" /* s */
#include "init.h" /* remake_world() */
-#include "map.h" /* remake_map() */
+#include "map.h" /* init_empty_map(), remake_map() */
#include "thing_actions.h" /* ThingAction, actor_wait(), actor_move(),
* actor_use(), actor_pickup(), actor_drop()
*/
#include "things.h" /* Thing, ThingType, add_thing(), get_thing(), own_thing(),
- * free_things(), add_thing_to_memory_map(),get_thing_type()
+ * free_things(), add_thing_to_memory_map(),get_thing_type(),
+ * get_player()
*/
#include "world.h" /* world */
return err_line(1, "No thing type defined to manipulate yet.");
}
int16_t id;
- if ( parse_val(tok0,tok1,s[S_CMD_TT_CONSUM],'8',(char *) &tt->consumable)
+ if ( parse_val(tok0,tok1,s[S_CMD_TT_CONSUM],'u',(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)
|| parse_val(tok0,tok1,s[S_CMD_TT_SYMB],'c',(char *) &tt->char_on_map)
|| parse_val(tok0,tok1,s[S_CMD_TT_PROL],'8',(char *) &tt->proliferate)
- || parse_val(tok0,tok1,s[S_CMD_TT_NAME],'s',(char *) &tt->name));
+ || parse_val(tok0,tok1,s[S_CMD_TT_NAME],'s',(char *) &tt->name))
+ {
+ ;
+ }
else if (parse_val(tok0, tok1, s[S_CMD_TT_CORPS],'8',(char *)&id))
{
if (!get_thing_type(id))
if (world.exists && t->lifepoints)
{
build_fov_map(t);
+ if (t == get_player())
+ {
+ update_map_memory(t);
+ }
}
}
return 1;
( !strcmp(tok0, s[S_CMD_T_PROGRESS]) || !strcmp(tok0, s[S_CMD_T_TYPE])
|| !strcmp(tok0, s[S_CMD_T_CARRIES]) || !strcmp(tok0, s[S_CMD_T_POSY])
|| !strcmp(tok0, s[S_CMD_T_POSY]) || !strcmp(tok0, s[S_CMD_T_ARGUMENT])
- || !strcmp(tok0, s[S_CMD_T_HP]) || !strcmp(tok0, s[S_CMD_T_COMMAND])))
+ || !strcmp(tok0, s[S_CMD_T_HP]) || !strcmp(tok0, s[S_CMD_T_COMMAND])
+ || !strcmp(tok0, s[S_CMD_T_SATIATION])))
{
return err_line(1, "No thing defined to manipulate yet.");
}
|| 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_val(tok0,tok1, s[S_CMD_T_SATIATION], 'i',(char *)&t->satiation)
|| parse_position(tok0, tok1, t)
|| parse_carry(tok0, tok1, t));
else if (parse_val(tok0, tok1, s[S_CMD_T_ID], 'i', (char *) &id))
if (ti->lifepoints)
{
build_fov_map(ti);
+ if (ti == get_player())
+ {
+ update_map_memory(ti);
+ }
}
}
world.exists = 1;
extern uint8_t parse_god_command_2arg(char * tok0, char * tok1, char * tok2)
{
- if (!t && !strcmp(tok0, s[S_CMD_T_MEMMAP]))
+ if (!t && ( !strcmp(tok0, s[S_CMD_T_MEMMAP])
+ || !strcmp(tok0, s[S_CMD_T_MEMDEPTHMAP])))
{
return err_line(1, "No thing defined to manipulate yet.");
}
- if (!strcmp(tok0, s[S_CMD_T_MEMMAP]))
+ if (!strcmp(tok0,s[S_CMD_T_MEMMAP]) || !strcmp(tok0,s[S_CMD_T_MEMDEPTHMAP]))
{
uint8_t y = atoi(tok1);
if (parsetest_int(tok1, '8') || y >= world.map.length)
{
return err_line(1, "Map line length is unequal map width.");
}
- if (!t->mem_map)
+ if (!strcmp(tok0,s[S_CMD_T_MEMMAP]))
+ {
+ if (!t->mem_map)
+ {
+ init_empty_map(&(t->mem_map));
+ }
+ memcpy(t->mem_map + y * world.map.length, tok2, world.map.length);
+ }
+ else
{
- uint32_t map_size = world.map.length * world.map.length;
- t->mem_map = try_malloc(map_size, __func__);
- memset(t->mem_map, ' ', map_size);
+ if (!t->mem_depth_map)
+ {
+ init_empty_map(&(t->mem_depth_map));
+ }
+ memcpy(t->mem_depth_map+y*world.map.length, tok2, world.map.length);
}
- memcpy(t->mem_map + y * world.map.length, tok2, world.map.length);
}
else
{