OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] #37353 feature.c/h 追加。 / Add feature.c/h.
[hengband/hengband.git]
/
src
/
rooms-vault.c
diff --git
a/src/rooms-vault.c
b/src/rooms-vault.c
index
4d3180b
..
b38da22
100644
(file)
--- a/
src/rooms-vault.c
+++ b/
src/rooms-vault.c
@@
-5,6
+5,7
@@
#include "store.h"
#include "trap.h"
#include "monster.h"
#include "store.h"
#include "trap.h"
#include "monster.h"
+#include "feature.h"
/*
* This function creates a random vault that looks like a collection of bubbles.
/*
* This function creates a random vault that looks like a collection of bubbles.
@@
-69,9
+70,9
@@
static void build_bubble_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
int side_x = x0 - xhsize + i;
place_outer_noperm_bold(y0 - yhsize + 0, side_x);
int side_x = x0 - xhsize + i;
place_outer_noperm_bold(y0 - yhsize + 0, side_x);
-
cave
[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(y0 - yhsize + ysize - 1, side_x);
place_outer_noperm_bold(y0 - yhsize + ysize - 1, side_x);
-
cave
[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
}
/* Left and right boundaries */
}
/* Left and right boundaries */
@@
-80,9
+81,9
@@
static void build_bubble_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
int side_y = y0 - yhsize + i;
place_outer_noperm_bold(side_y, x0 - xhsize + 0);
int side_y = y0 - yhsize + i;
place_outer_noperm_bold(side_y, x0 - xhsize + 0);
-
cave
[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(side_y, x0 - xhsize + xsize - 1);
place_outer_noperm_bold(side_y, x0 - xhsize + xsize - 1);
-
cave
[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY);
}
/* Fill in middle with bubbles */
}
/* Fill in middle with bubbles */
@@
-132,7
+133,7
@@
static void build_bubble_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
}
/* clean up rest of flags */
}
/* clean up rest of flags */
-
cave
[y0 - yhsize + y][x0 - xhsize + x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y0 - yhsize + y][x0 - xhsize + x].info |= (CAVE_ROOM | CAVE_ICKY);
}
}
}
}
@@
-170,7
+171,7
@@
static void build_room_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION
POSITION y = y0 - yhsize + y1;
place_extra_bold(y, x);
POSITION y = y0 - yhsize + y1;
place_extra_bold(y, x);
-
cave
[y][x].info &= (~CAVE_ICKY);
+
grid_array
[y][x].info &= (~CAVE_ICKY);
}
}
}
}
@@
-197,7
+198,7
@@
static void build_room_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION
}
}
-/* Create a random vault out of a fractal
cave
*/
+/* Create a random vault out of a fractal
grid_array
*/
static void build_cave_vault(POSITION x0, POSITION y0, POSITION xsiz, POSITION ysiz)
{
int grd, roug, cutoff;
static void build_cave_vault(POSITION x0, POSITION y0, POSITION xsiz, POSITION ysiz)
{
int grd, roug, cutoff;
@@
-239,7
+240,7
@@
static void build_cave_vault(POSITION x0, POSITION y0, POSITION xsiz, POSITION y
{
for (y = 0; y <= ysize; y++)
{
{
for (y = 0; y <= ysize; y++)
{
-
cave
[y0 - yhsize + y][x0 - xhsize + x].info |= CAVE_ICKY;
+
grid_array
[y0 - yhsize + y][x0 - xhsize + x].info |= CAVE_ICKY;
}
}
}
}
@@
-309,7
+310,7
@@
static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xm
{
POSITION dx, dy, x, y, i, j;
concptr t;
{
POSITION dx, dy, x, y, i, j;
concptr t;
- grid_type *
c
_ptr;
+ grid_type *
g
_ptr;
/* Place dungeon features and objects */
for (t = data, dy = 0; dy < ymax; dy++)
/* Place dungeon features and objects */
for (t = data, dy = 0; dy < ymax; dy++)
@@
-339,45
+340,45
@@
static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xm
/* Hack -- skip "non-grids" */
if (*t == ' ') continue;
/* Hack -- skip "non-grids" */
if (*t == ' ') continue;
-
c_ptr = &cave
[y][x];
+
g_ptr = &grid_array
[y][x];
/* Lay down a floor */
/* Lay down a floor */
- place_floor_grid(
c
_ptr);
+ place_floor_grid(
g
_ptr);
/* Remove any mimic */
/* Remove any mimic */
-
c
_ptr->mimic = 0;
+
g
_ptr->mimic = 0;
/* Part of a vault */
/* Part of a vault */
-
c
_ptr->info |= (CAVE_ROOM | CAVE_ICKY);
+
g
_ptr->info |= (CAVE_ROOM | CAVE_ICKY);
/* Analyze the grid */
switch (*t)
{
/* Granite wall (outer) */
case '%':
/* Analyze the grid */
switch (*t)
{
/* Granite wall (outer) */
case '%':
- place_outer_noperm_grid(
c
_ptr);
+ place_outer_noperm_grid(
g
_ptr);
break;
/* Granite wall (inner) */
case '#':
break;
/* Granite wall (inner) */
case '#':
- place_inner_grid(
c
_ptr);
+ place_inner_grid(
g
_ptr);
break;
/* Glass wall (inner) */
case '$':
break;
/* Glass wall (inner) */
case '$':
- place_inner_grid(
c
_ptr);
-
c
_ptr->feat = feat_glass_wall;
+ place_inner_grid(
g
_ptr);
+
g
_ptr->feat = feat_glass_wall;
break;
/* Permanent wall (inner) */
case 'X':
break;
/* Permanent wall (inner) */
case 'X':
- place_inner_perm_grid(
c
_ptr);
+ place_inner_perm_grid(
g
_ptr);
break;
/* Permanent glass wall (inner) */
case 'Y':
break;
/* Permanent glass wall (inner) */
case 'Y':
- place_inner_perm_grid(
c
_ptr);
-
c
_ptr->feat = feat_permanent_glass_wall;
+ place_inner_perm_grid(
g
_ptr);
+
g
_ptr->feat = feat_permanent_glass_wall;
break;
/* Treasure/trap */
break;
/* Treasure/trap */
@@
-399,7
+400,7
@@
static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xm
/* Tree */
case ':':
/* Tree */
case ':':
-
c
_ptr->feat = feat_tree;
+
g
_ptr->feat = feat_tree;
break;
/* Secret doors */
break;
/* Secret doors */
@@
-410,7
+411,7
@@
static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xm
/* Secret glass doors */
case '-':
place_secret_door(y, x, DOOR_GLASS_DOOR);
/* Secret glass doors */
case '-':
place_secret_door(y, x, DOOR_GLASS_DOOR);
- if (is_closed_door(
c_ptr->feat)) c
_ptr->mimic = feat_glass_wall;
+ if (is_closed_door(
g_ptr->feat)) g
_ptr->mimic = feat_glass_wall;
break;
/* Curtains */
break;
/* Curtains */
@@
-818,10
+819,10
@@
static void build_target_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
for (y = y0 - rad; y <= y0 + rad; y++)
{
/* clear room flag */
for (y = y0 - rad; y <= y0 + rad; y++)
{
/* clear room flag */
-
cave
[y][x].info &= ~(CAVE_ROOM);
+
grid_array
[y][x].info &= ~(CAVE_ROOM);
/* Vault - so is "icky" */
/* Vault - so is "icky" */
-
cave
[y][x].info |= CAVE_ICKY;
+
grid_array
[y][x].info |= CAVE_ICKY;
if (dist2(y0, x0, y, x, h1, h2, h3, h4) <= rad - 1)
{
if (dist2(y0, x0, y, x, h1, h2, h3, h4) <= rad - 1)
{
@@
-981,7
+982,7
@@
static void build_elemental_vault(POSITION x0, POSITION y0, POSITION xsiz, POSIT
{
for (y = 0; y <= ysize; y++)
{
{
for (y = 0; y <= ysize; y++)
{
-
cave
[y0 - yhsize + y][x0 - xhsize + x].info |= CAVE_ICKY;
+
grid_array
[y0 - yhsize + y][x0 - xhsize + x].info |= CAVE_ICKY;
}
}
}
}
@@
-1030,7
+1031,7
@@
static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
if (!in_bounds(y1 - 2, x)) break;
{
if (!in_bounds(y1 - 2, x)) break;
-
cave
[y1 - 2][x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y1 - 2][x].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(y1 - 2, x);
}
place_outer_noperm_bold(y1 - 2, x);
}
@@
-1039,7
+1040,7
@@
static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
if (!in_bounds(y2 + 2, x)) break;
{
if (!in_bounds(y2 + 2, x)) break;
-
cave
[y2 + 2][x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y2 + 2][x].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(y2 + 2, x);
}
place_outer_noperm_bold(y2 + 2, x);
}
@@
-1048,7
+1049,7
@@
static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
if (!in_bounds(y, x1 - 2)) break;
{
if (!in_bounds(y, x1 - 2)) break;
-
cave
[y][x1 - 2].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y][x1 - 2].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(y, x1 - 2);
}
place_outer_noperm_bold(y, x1 - 2);
}
@@
-1057,7
+1058,7
@@
static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
if (!in_bounds(y, x2 + 2)) break;
{
if (!in_bounds(y, x2 + 2)) break;
-
cave
[y][x2 + 2].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y][x2 + 2].info |= (CAVE_ROOM | CAVE_ICKY);
place_outer_noperm_bold(y, x2 + 2);
}
place_outer_noperm_bold(y, x2 + 2);
}
@@
-1066,12
+1067,12
@@
static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
for (x = x1 - 1; x <= x2 + 1; x++)
{
{
for (x = x1 - 1; x <= x2 + 1; x++)
{
- grid_type *
c_ptr = &cave
[y][x];
+ grid_type *
g_ptr = &grid_array
[y][x];
-
c
_ptr->info |= (CAVE_ROOM | CAVE_ICKY);
+
g
_ptr->info |= (CAVE_ROOM | CAVE_ICKY);
/* Permanent walls */
/* Permanent walls */
- place_inner_perm_grid(
c
_ptr);
+ place_inner_perm_grid(
g
_ptr);
}
}
}
}
@@
-1151,7
+1152,7
@@
static void build_castle_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
{
for (x = x1 - 1; x <= x2 + 1; x++)
{
{
for (x = x1 - 1; x <= x2 + 1; x++)
{
-
cave
[y][x].info |= (CAVE_ROOM | CAVE_ICKY);
+
grid_array
[y][x].info |= (CAVE_ROOM | CAVE_ICKY);
/* Make everything a floor */
place_floor_bold(y, x);
}
/* Make everything a floor */
place_floor_bold(y, x);
}