*/
#include "angband.h"
-#include "generate.h"
+#include "util.h"
+
+#include "artifact.h"
+#include "floor-generate.h"
+#include "dungeon.h"
#include "floor.h"
#include "floor-streams.h"
#include "grid.h"
#include "monster.h"
#include "feature.h"
+#include "object-flavor.h"
#include "object-hook.h"
+#include "spells.h"
+#include "spells-floor.h"
/*!
* @param width 基本幅
* @return なし
*/
-static void recursive_river(POSITION x1, POSITION y1, POSITION x2, POSITION y2, FEAT_IDX feat1, FEAT_IDX feat2, POSITION width)
+static void recursive_river(floor_type *floor_ptr, POSITION x1, POSITION y1, POSITION x2, POSITION y2, FEAT_IDX feat1, FEAT_IDX feat2, POSITION width)
{
POSITION dx, dy, length, l, x, y;
POSITION changex, changey;
changey = 0;
}
- if (!in_bounds(y1 + dy + changey, x1 + dx + changex))
+ if (!in_bounds(floor_ptr, y1 + dy + changey, x1 + dx + changex))
{
changex = 0;
changey = 0;
}
/* construct river out of two smaller ones */
- recursive_river(x1, y1, x1 + dx + changex, y1 + dy + changey, feat1, feat2, width);
- recursive_river(x1 + dx + changex, y1 + dy + changey, x2, y2, feat1, feat2, width);
+ recursive_river(floor_ptr, x1, y1, x1 + dx + changex, y1 + dy + changey, feat1, feat2, width);
+ recursive_river(floor_ptr, x1 + dx + changex, y1 + dy + changey, x2, y2, feat1, feat2, width);
/* Split the river some of the time - junctions look cool */
if (one_in_(DUN_WAT_CHG) && (width > 0))
{
- recursive_river(x1 + dx + changex, y1 + dy + changey,
+ recursive_river(floor_ptr, x1 + dx + changex, y1 + dy + changey,
x1 + 8 * (dx + changex), y1 + 8 * (dy + changey),
feat1, feat2, width - 1);
}
{
for (tx = x - width - 1; tx <= x + width + 1; tx++)
{
- if (!in_bounds2(ty, tx)) continue;
+ if (!in_bounds2(floor_ptr, ty, tx)) continue;
- g_ptr = ¤t_floor_ptr->grid_array[ty][tx];
+ g_ptr = &floor_ptr->grid_array[ty][tx];
if (g_ptr->feat == feat1) continue;
if (g_ptr->feat == feat2) continue;
* @param feat2 境界部地形ID
* @return なし
*/
-void add_river(FEAT_IDX feat1, FEAT_IDX feat2)
+void add_river(floor_type *floor_ptr, FEAT_IDX feat1, FEAT_IDX feat2)
{
POSITION y2, x2;
POSITION y1 = 0, x1 = 0;
/* Hack -- Choose starting point */
- y2 = randint1(current_floor_ptr->height / 2 - 2) + current_floor_ptr->height / 2;
- x2 = randint1(current_floor_ptr->width / 2 - 2) + current_floor_ptr->width / 2;
+ y2 = randint1(floor_ptr->height / 2 - 2) + floor_ptr->height / 2;
+ x2 = randint1(floor_ptr->width / 2 - 2) + floor_ptr->width / 2;
/* Hack -- Choose ending point somewhere on boundary */
switch(randint1(4))
case 1:
{
/* top boundary */
- x1 = randint1(current_floor_ptr->width-2)+1;
+ x1 = randint1(floor_ptr->width-2)+1;
y1 = 1;
break;
}
{
/* left boundary */
x1 = 1;
- y1 = randint1(current_floor_ptr->height-2)+1;
+ y1 = randint1(floor_ptr->height-2)+1;
break;
}
case 3:
{
/* right boundary */
- x1 = current_floor_ptr->width-1;
- y1 = randint1(current_floor_ptr->height-2)+1;
+ x1 = floor_ptr->width-1;
+ y1 = randint1(floor_ptr->height-2)+1;
break;
}
case 4:
{
/* bottom boundary */
- x1 = randint1(current_floor_ptr->width-2)+1;
- y1 = current_floor_ptr->height-1;
+ x1 = randint1(floor_ptr->width-2)+1;
+ y1 = floor_ptr->height-1;
break;
}
}
wid = randint1(DUN_WAT_RNG);
- recursive_river(x1, y1, x2, y2, feat1, feat2, wid);
+ recursive_river(floor_ptr, x1, y1, x2, y2, feat1, feat2, wid);
/* Hack - Save the location as a "room" */
if (dun->cent_n < CENT_MAX)
bool streamer_may_have_gold = have_flag(streamer_ptr->flags, FF_MAY_HAVE_GOLD);
/* Hack -- Choose starting point */
- y = rand_spread(current_floor_ptr->height / 2, current_floor_ptr->height / 6);
- x = rand_spread(current_floor_ptr->width / 2, current_floor_ptr->width / 6);
+ y = rand_spread(p_ptr->current_floor_ptr->height / 2, p_ptr->current_floor_ptr->height / 6);
+ x = rand_spread(p_ptr->current_floor_ptr->width / 2, p_ptr->current_floor_ptr->width / 6);
/* Choose a random compass direction */
dir = randint0(8);
{
ty = rand_spread(y, d);
tx = rand_spread(x, d);
- if (!in_bounds2(ty, tx)) continue;
+ if (!in_bounds2(p_ptr->current_floor_ptr, ty, tx)) continue;
break;
}
- g_ptr = ¤t_floor_ptr->grid_array[ty][tx];
+ g_ptr = &p_ptr->current_floor_ptr->grid_array[ty][tx];
f_ptr = &f_info[g_ptr->feat];
if (have_flag(f_ptr->flags, FF_MOVE) && (have_flag(f_ptr->flags, FF_WATER) || have_flag(f_ptr->flags, FF_LAVA)))
if (is_closed_door(g_ptr->feat)) continue;
}
- if (g_ptr->m_idx && !(have_flag(streamer_ptr->flags, FF_PLACE) && monster_can_cross_terrain(feat, &r_info[current_floor_ptr->m_list[g_ptr->m_idx].r_idx], 0)))
+ if (g_ptr->m_idx && !(have_flag(streamer_ptr->flags, FF_PLACE) && monster_can_cross_terrain(feat, &r_info[p_ptr->current_floor_ptr->m_list[g_ptr->m_idx].r_idx], 0)))
{
/* Delete the monster (if any) */
delete_monster(ty, tx);
/* Scan all objects in the grid */
for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
- object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx];
+ object_type *o_ptr = &p_ptr->current_floor_ptr->o_list[this_o_idx];
next_o_idx = o_ptr->next_o_idx;
/* Hack -- Preserve unknown artifacts */
}
/* Quit before leaving the dungeon */
- if (!in_bounds(y, x)) break;
+ if (!in_bounds(p_ptr->current_floor_ptr, y, x)) break;
}
}
* This happens in real world lava tubes.
* </pre>
*/
-void place_trees(POSITION x, POSITION y)
+void place_trees(floor_type *floor_ptr, POSITION x, POSITION y)
{
int i, j;
grid_type *g_ptr;
{
for (j = y - 3; j < y + 4; j++)
{
- if (!in_bounds(j, i)) continue;
- g_ptr = ¤t_floor_ptr->grid_array[j][i];
+ if (!in_bounds(floor_ptr, j, i)) continue;
+ g_ptr = &floor_ptr->grid_array[j][i];
if (g_ptr->info & CAVE_ICKY) continue;
if (g_ptr->o_idx) continue;
if ((distance(j, i, y, x) > 1) || (randint1(100) < 25))
{
if (randint1(100) < 75)
- current_floor_ptr->grid_array[j][i].feat = feat_tree;
+ floor_ptr->grid_array[j][i].feat = feat_tree;
}
else
{
- current_floor_ptr->grid_array[j][i].feat = feat_rubble;
+ floor_ptr->grid_array[j][i].feat = feat_rubble;
}
/* Clear garbage of hidden trap or door */
g_ptr->mimic = 0;
/* Light area since is open above */
- if (!(d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS)) current_floor_ptr->grid_array[j][i].info |= (CAVE_GLOW | CAVE_ROOM);
+ if (!(d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS)) floor_ptr->grid_array[j][i].info |= (CAVE_GLOW | CAVE_ROOM);
}
}
}
if (!ironman_downward && one_in_(3))
{
/* up stair */
- current_floor_ptr->grid_array[y][x].feat = feat_up_stair;
+ floor_ptr->grid_array[y][x].feat = feat_up_stair;
}
}
for (n = 0; n < randint1(5); n++)
{
/* Pick an epi-center */
- x1 = rand_range(5, current_floor_ptr->width - 1 - 5);
- y1 = rand_range(5, current_floor_ptr->height - 1 - 5);
+ x1 = rand_range(5, p_ptr->current_floor_ptr->width - 1 - 5);
+ y1 = rand_range(5, p_ptr->current_floor_ptr->height - 1 - 5);
(void)destroy_area(y1, x1, 15, TRUE);
}
OSDN Git Service
