for (x = 0; x < MAX_WID; x++)
{
/* Create "solid" perma-wall */
- place_solid_perm_bold(creature_ptr->current_floor_ptr, y, x);
+ place_bold(creature_ptr, y, x, solid_perm);
}
}
creature_ptr->x = creature_ptr->current_floor_ptr->width / 2;
/* Give one square */
- place_floor_bold(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x);
+ place_bold(creature_ptr, creature_ptr->y, creature_ptr->x, floor);
wipe_generate_random_floor_flags(creature_ptr->current_floor_ptr);
}
(void)COPY(&party_mon[0], m_ptr, monster_type);
/* Delete from this floor */
- delete_monster_idx(master_ptr->riding);
+ delete_monster_idx(master_ptr, master_ptr->riding);
}
}
* when you or the pet can see the other.
*/
if (m_ptr->nickname &&
- ((player_has_los_bold(master_ptr, m_ptr->fy, m_ptr->fx) && projectable(master_ptr->current_floor_ptr, master_ptr->y, master_ptr->x, m_ptr->fy, m_ptr->fx)) ||
- (los(master_ptr->current_floor_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x) && projectable(master_ptr->current_floor_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x))))
+ ((player_has_los_bold(master_ptr, m_ptr->fy, m_ptr->fx) && projectable(master_ptr, master_ptr->y, master_ptr->x, m_ptr->fy, m_ptr->fx)) ||
+ (los(master_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x) && projectable(master_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x))))
{
if (dis > 3) continue;
}
num++;
/* Delete from this floor */
- delete_monster_idx(i);
+ delete_monster_idx(master_ptr, i);
}
}
if (!m_ptr->nickname) continue;
if (master_ptr->riding == i) continue;
- monster_desc(m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
- exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
+ monster_desc(master_ptr, m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+ exe_write_diary(master_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
}
}
if (is_seen(m_ptr))
{
GAME_TEXT m_name[MAX_NLEN];
- monster_desc(m_name, m_ptr, 0);
+ monster_desc(master_ptr, m_name, m_ptr, 0);
msg_format(_("%sは消え去った!", "%^s disappears!"), m_name);
}
- delete_monster_idx(i);
+ delete_monster_idx(master_ptr, i);
}
}
}
if (i == 0)
{
- m_idx = m_pop();
+ m_idx = m_pop(master_ptr);
master_ptr->riding = m_idx;
if (m_idx)
{
{
for (j = 1000; j > 0; j--)
{
- scatter(master_ptr->current_floor_ptr, &cy, &cx, master_ptr->y, master_ptr->x, d, 0);
+ scatter(master_ptr, &cy, &cx, master_ptr->y, master_ptr->x, d, 0);
if (monster_can_enter(cy, cx, &r_info[party_mon[i].r_idx], 0)) break;
}
if (j) break;
}
- m_idx = (d == 6) ? 0 : m_pop();
+ m_idx = (d == 6) ? 0 : m_pop(master_ptr);
}
if (m_idx)
monster_race *r_ptr = real_r_ptr(m_ptr);
GAME_TEXT m_name[MAX_NLEN];
- monster_desc(m_name, m_ptr, 0);
+ monster_desc(master_ptr, m_name, m_ptr, 0);
msg_format(_("%sとはぐれてしまった。", "You have lost sight of %s."), m_name);
if (record_named_pet && m_ptr->nickname)
{
- monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
- exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
+ monster_desc(master_ptr, m_name, m_ptr, MD_INDEF_VISIBLE);
+ exe_write_diary(master_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
}
/* Pre-calculated in precalc_cur_num_of_pet(), but need to decrease */
(r_ptr->flags7 & RF7_NAZGUL)) continue;
/* Delete non-unique quest monsters */
- delete_monster_idx(i);
+ delete_monster_idx(creature_ptr, i);
}
/* Check if there is a same item */
clear_mon_lite(creature_ptr->current_floor_ptr);
/* Save current floor */
- if (!save_floor(sf_ptr, 0))
+ if (!save_floor(creature_ptr, sf_ptr, 0))
{
/* Save failed -- No return */
prepare_change_floor_mode(creature_ptr, CFM_NO_RETURN);
m_ptr->hp = m_ptr->maxhp = m_ptr->max_maxhp;
/* Remove timed status (except MTIMED_CSLEEP) */
- (void)set_monster_fast(i, 0);
- (void)set_monster_slow(i, 0);
- (void)set_monster_stunned(i, 0);
- (void)set_monster_confused(i, 0);
- (void)set_monster_monfear(i, 0);
- (void)set_monster_invulner(i, 0, FALSE);
+ (void)set_monster_fast(creature_ptr, i, 0);
+ (void)set_monster_slow(creature_ptr, i, 0);
+ (void)set_monster_stunned(creature_ptr, i, 0);
+ (void)set_monster_confused(creature_ptr, i, 0);
+ (void)set_monster_monfear(creature_ptr, i, 0);
+ (void)set_monster_invulner(creature_ptr, i, 0, FALSE);
}
/* Extract real monster race */
if (r_ptr->floor_id != new_floor_id)
{
/* Disapper from here */
- delete_monster_idx(i);
+ delete_monster_idx(creature_ptr, i);
}
}
}
}
- (void)place_quest_monsters(creature_ptr->current_floor_ptr, creature_ptr);
+ (void)place_quest_monsters(creature_ptr);
/* Place some random monsters */
alloc_times = absence_ticks / alloc_chance;
for (i = 0; i < alloc_times; i++)
{
/* Make a (group of) new monster */
- (void)alloc_monster(0, 0);
+ (void)alloc_monster(creature_ptr, 0, 0);
}
}