<ClCompile Include="..\..\src\mutation\mutation-investor-remover.c" />\r
<ClCompile Include="..\..\src\object-use\read-execution.c" />\r
<ClCompile Include="..\..\src\player\player-status-flags.c" />\r
+ <ClCompile Include="..\..\src\player\player-view.c" />\r
<ClCompile Include="..\..\src\racial\class-racial-switcher.c" />\r
<ClCompile Include="..\..\src\racial\mutation-racial-selector.c" />\r
<ClCompile Include="..\..\src\action\racial-execution.c" />\r
<ClInclude Include="..\..\src\mutation\mutation-investor-remover.h" />\r
<ClInclude Include="..\..\src\object-use\read-execution.h" />\r
<ClInclude Include="..\..\src\player\player-status-flags.h" />\r
+ <ClInclude Include="..\..\src\player\player-view.h" />\r
<ClInclude Include="..\..\src\racial\class-racial-switcher.h" />\r
<ClInclude Include="..\..\src\racial\mutation-racial-selector.h" />\r
<ClInclude Include="..\..\src\racial\race-racial-command-setter.h" />\r
<ClCompile Include="..\..\src\monster\monster-status-setter.c">
<Filter>monster</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\player\player-view.c">
+ <Filter>player</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\combat\shoot.h">
<ClInclude Include="..\..\src\monster\monster-status-setter.h">
<Filter>monster</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\player\player-view.h">
+ <Filter>player</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\wall.bmp" />
player/player-status-flags.c player/player-status-flags.h \
player/player-personalities-types.h \
player/player-sex.c player/player-sex.h \
+ player/player-view.c player/player-view.h \
player/selfinfo.c player/selfinfo.h \
player/special-defense-types.h \
\
floor_ptr->view_n = 0;
}
-
-/*
- * Helper function for "update_view()" below
- *
- * We are checking the "viewability" of grid (y,x) by the player.
- *
- * This function assumes that (y,x) is legal (i.e. on the map).
- *
- * Grid (y1,x1) is on the "diagonal" between (subject_ptr->y,subject_ptr->x) and (y,x)
- * Grid (y2,x2) is "adjacent", also between (subject_ptr->y,subject_ptr->x) and (y,x).
- *
- * Note that we are using the "CAVE_XTRA" field for marking grids as
- * "easily viewable". This bit is cleared at the end of "update_view()".
- *
- * This function adds (y,x) to the "viewable set" if necessary.
- *
- * This function now returns "TRUE" if vision is "blocked" by grid (y,x).
- */
-static bool update_view_aux(player_type *subject_ptr, POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2)
-{
- floor_type *floor_ptr = subject_ptr->current_floor_ptr;
- grid_type *g1_c_ptr;
- grid_type *g2_c_ptr;
- g1_c_ptr = &floor_ptr->grid_array[y1][x1];
- g2_c_ptr = &floor_ptr->grid_array[y2][x2];
- bool f1 = (cave_los_grid(g1_c_ptr));
- bool f2 = (cave_los_grid(g2_c_ptr));
- if (!f1 && !f2)
- return TRUE;
-
- bool v1 = (f1 && (g1_c_ptr->info & CAVE_VIEW));
- bool v2 = (f2 && (g2_c_ptr->info & CAVE_VIEW));
- if (!v1 && !v2)
- return TRUE;
-
- grid_type *g_ptr;
- g_ptr = &floor_ptr->grid_array[y][x];
- bool wall = (!cave_los_grid(g_ptr));
- bool z1 = (v1 && (g1_c_ptr->info & CAVE_XTRA));
- bool z2 = (v2 && (g2_c_ptr->info & CAVE_XTRA));
- if (z1 && z2) {
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y, x);
- return wall;
- }
-
- if (z1) {
- cave_view_hack(floor_ptr, g_ptr, y, x);
- return wall;
- }
-
- if (v1 && v2) {
- cave_view_hack(floor_ptr, g_ptr, y, x);
- return wall;
- }
-
- if (wall) {
- cave_view_hack(floor_ptr, g_ptr, y, x);
- return wall;
- }
-
- if (los(subject_ptr, subject_ptr->y, subject_ptr->x, y, x)) {
- cave_view_hack(floor_ptr, g_ptr, y, x);
- return wall;
- }
-
- return TRUE;
-}
-
-/*
- * Calculate the viewable space
- *
- * 1: Process the player
- * 1a: The player is always (easily) viewable
- * 2: Process the diagonals
- * 2a: The diagonals are (easily) viewable up to the first wall
- * 2b: But never go more than 2/3 of the "full" distance
- * 3: Process the main axes
- * 3a: The main axes are (easily) viewable up to the first wall
- * 3b: But never go more than the "full" distance
- * 4: Process sequential "strips" in each of the eight octants
- * 4a: Each strip runs along the previous strip
- * 4b: The main axes are "previous" to the first strip
- * 4c: Process both "sides" of each "direction" of each strip
- * 4c1: Each side aborts as soon as possible
- * 4c2: Each side tells the next strip how far it has to check
- */
-void update_view(player_type *subject_ptr)
-{
- int n, m, d, k, z;
- POSITION y, x;
-
- int se, sw, ne, nw, es, en, ws, wn;
-
- int full, over;
-
- floor_type *floor_ptr = subject_ptr->current_floor_ptr;
- POSITION y_max = floor_ptr->height - 1;
- POSITION x_max = floor_ptr->width - 1;
-
- grid_type *g_ptr;
- if (view_reduce_view && !floor_ptr->dun_level) {
- full = MAX_SIGHT / 2;
- over = MAX_SIGHT * 3 / 4;
- } else {
- full = MAX_SIGHT;
- over = MAX_SIGHT * 3 / 2;
- }
-
- for (n = 0; n < floor_ptr->view_n; n++) {
- y = floor_ptr->view_y[n];
- x = floor_ptr->view_x[n];
- g_ptr = &floor_ptr->grid_array[y][x];
- g_ptr->info &= ~(CAVE_VIEW);
- g_ptr->info |= CAVE_TEMP;
- tmp_pos.y[tmp_pos.n] = y;
- tmp_pos.x[tmp_pos.n] = x;
- tmp_pos.n++;
- }
-
- floor_ptr->view_n = 0;
- y = subject_ptr->y;
- x = subject_ptr->x;
- g_ptr = &floor_ptr->grid_array[y][x];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y, x);
-
- z = full * 2 / 3;
- for (d = 1; d <= z; d++) {
- g_ptr = &floor_ptr->grid_array[y + d][x + d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y + d, x + d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- for (d = 1; d <= z; d++) {
- g_ptr = &floor_ptr->grid_array[y + d][x - d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y + d, x - d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- for (d = 1; d <= z; d++) {
- g_ptr = &floor_ptr->grid_array[y - d][x + d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y - d, x + d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- for (d = 1; d <= z; d++) {
- g_ptr = &floor_ptr->grid_array[y - d][x - d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y - d, x - d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- for (d = 1; d <= full; d++) {
- g_ptr = &floor_ptr->grid_array[y + d][x];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y + d, x);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- se = sw = d;
- for (d = 1; d <= full; d++) {
- g_ptr = &floor_ptr->grid_array[y - d][x];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y - d, x);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- ne = nw = d;
- for (d = 1; d <= full; d++) {
- g_ptr = &floor_ptr->grid_array[y][x + d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y, x + d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- es = en = d;
- for (d = 1; d <= full; d++) {
- g_ptr = &floor_ptr->grid_array[y][x - d];
- g_ptr->info |= CAVE_XTRA;
- cave_view_hack(floor_ptr, g_ptr, y, x - d);
- if (!cave_los_grid(g_ptr))
- break;
- }
-
- ws = wn = d;
- for (n = 1; n <= over / 2; n++) {
- POSITION ypn, ymn, xpn, xmn;
- z = over - n - n;
- if (z > full - n)
- z = full - n;
-
- while ((z + n + (n >> 1)) > full)
- z--;
-
- ypn = y + n;
- ymn = y - n;
- xpn = x + n;
- xmn = x - n;
- if (ypn < y_max) {
- m = MIN(z, y_max - ypn);
- if ((xpn <= x_max) && (n < se)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ypn + d, xpn, ypn + d - 1, xpn - 1, ypn + d - 1, xpn)) {
- if (n + d >= se)
- break;
- } else
- k = n + d;
- }
-
- se = k + 1;
- }
-
- if ((xmn >= 0) && (n < sw)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ypn + d, xmn, ypn + d - 1, xmn + 1, ypn + d - 1, xmn)) {
- if (n + d >= sw)
- break;
- } else
- k = n + d;
- }
-
- sw = k + 1;
- }
- }
-
- if (ymn > 0) {
- m = MIN(z, ymn);
- if ((xpn <= x_max) && (n < ne)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ymn - d, xpn, ymn - d + 1, xpn - 1, ymn - d + 1, xpn)) {
- if (n + d >= ne)
- break;
- } else
- k = n + d;
- }
-
- ne = k + 1;
- }
-
- if ((xmn >= 0) && (n < nw)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ymn - d, xmn, ymn - d + 1, xmn + 1, ymn - d + 1, xmn)) {
- if (n + d >= nw)
- break;
- } else
- k = n + d;
- }
-
- nw = k + 1;
- }
- }
-
- if (xpn < x_max) {
- m = MIN(z, x_max - xpn);
- if ((ypn <= x_max) && (n < es)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ypn, xpn + d, ypn - 1, xpn + d - 1, ypn, xpn + d - 1)) {
- if (n + d >= es)
- break;
- } else
- k = n + d;
- }
-
- es = k + 1;
- }
-
- if ((ymn >= 0) && (n < en)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ymn, xpn + d, ymn + 1, xpn + d - 1, ymn, xpn + d - 1)) {
- if (n + d >= en)
- break;
- } else
- k = n + d;
- }
-
- en = k + 1;
- }
- }
-
- if (xmn > 0) {
- m = MIN(z, xmn);
- if ((ypn <= y_max) && (n < ws)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ypn, xmn - d, ypn - 1, xmn - d + 1, ypn, xmn - d + 1)) {
- if (n + d >= ws)
- break;
- } else
- k = n + d;
- }
-
- ws = k + 1;
- }
-
- if ((ymn >= 0) && (n < wn)) {
- for (k = n, d = 1; d <= m; d++) {
- if (update_view_aux(subject_ptr, ymn, xmn - d, ymn + 1, xmn - d + 1, ymn, xmn - d + 1)) {
- if (n + d >= wn)
- break;
- } else
- k = n + d;
- }
-
- wn = k + 1;
- }
- }
- }
-
- for (n = 0; n < floor_ptr->view_n; n++) {
- y = floor_ptr->view_y[n];
- x = floor_ptr->view_x[n];
- g_ptr = &floor_ptr->grid_array[y][x];
- g_ptr->info &= ~(CAVE_XTRA);
- if (g_ptr->info & CAVE_TEMP)
- continue;
-
- cave_note_and_redraw_later(floor_ptr, g_ptr, y, x);
- }
-
- for (n = 0; n < tmp_pos.n; n++) {
- y = tmp_pos.y[n];
- x = tmp_pos.x[n];
- g_ptr = &floor_ptr->grid_array[y][x];
- g_ptr->info &= ~(CAVE_TEMP);
- if (g_ptr->info & CAVE_VIEW)
- continue;
-
- cave_redraw_later(floor_ptr, g_ptr, y, x);
- }
-
- tmp_pos.n = 0;
- subject_ptr->update |= PU_DELAY_VIS;
-}
void forget_lite(floor_type *floor_ptr);
void update_lite(player_type *subject_ptr); // todo player-statusからだけ呼ばれている.
void forget_view(floor_type *floor_ptr);
-void update_view(player_type *subject_ptr); // todo player-statusからだけ呼ばれている.
#include "player/player-status-flags.h"
#include "player/race-info-table.h"
#include "player/special-defense-types.h"
+#include "player/player-view.h"
#include "realm/realm-hex-numbers.h"
#include "realm/realm-names-table.h"
#include "realm/realm-song-numbers.h"
--- /dev/null
+#include "player/player-view.h"
+#include "core/player-update-types.h"
+#include "floor/cave.h"
+#include "floor/floor.h"
+#include "game-option/map-screen-options.h"
+#include "grid/grid.h"
+#include "system/floor-type-definition.h"
+
+/*
+ * Helper function for "update_view()" below
+ *
+ * We are checking the "viewability" of grid (y,x) by the player.
+ *
+ * This function assumes that (y,x) is legal (i.e. on the map).
+ *
+ * Grid (y1,x1) is on the "diagonal" between (subject_ptr->y,subject_ptr->x) and (y,x)
+ * Grid (y2,x2) is "adjacent", also between (subject_ptr->y,subject_ptr->x) and (y,x).
+ *
+ * Note that we are using the "CAVE_XTRA" field for marking grids as
+ * "easily viewable". This bit is cleared at the end of "update_view()".
+ *
+ * This function adds (y,x) to the "viewable set" if necessary.
+ *
+ * This function now returns "TRUE" if vision is "blocked" by grid (y,x).
+ */
+static bool update_view_aux(player_type *subject_ptr, POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2)
+{
+ floor_type *floor_ptr = subject_ptr->current_floor_ptr;
+ grid_type *g1_c_ptr;
+ grid_type *g2_c_ptr;
+ g1_c_ptr = &floor_ptr->grid_array[y1][x1];
+ g2_c_ptr = &floor_ptr->grid_array[y2][x2];
+ bool f1 = (cave_los_grid(g1_c_ptr));
+ bool f2 = (cave_los_grid(g2_c_ptr));
+ if (!f1 && !f2)
+ return TRUE;
+
+ bool v1 = (f1 && (g1_c_ptr->info & CAVE_VIEW));
+ bool v2 = (f2 && (g2_c_ptr->info & CAVE_VIEW));
+ if (!v1 && !v2)
+ return TRUE;
+
+ grid_type *g_ptr;
+ g_ptr = &floor_ptr->grid_array[y][x];
+ bool wall = (!cave_los_grid(g_ptr));
+ bool z1 = (v1 && (g1_c_ptr->info & CAVE_XTRA));
+ bool z2 = (v2 && (g2_c_ptr->info & CAVE_XTRA));
+ if (z1 && z2) {
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+ return wall;
+ }
+
+ if (z1) {
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+ return wall;
+ }
+
+ if (v1 && v2) {
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+ return wall;
+ }
+
+ if (wall) {
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+ return wall;
+ }
+
+ if (los(subject_ptr, subject_ptr->y, subject_ptr->x, y, x)) {
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+ return wall;
+ }
+
+ return TRUE;
+}
+
+/*
+ * Calculate the viewable space
+ *
+ * 1: Process the player
+ * 1a: The player is always (easily) viewable
+ * 2: Process the diagonals
+ * 2a: The diagonals are (easily) viewable up to the first wall
+ * 2b: But never go more than 2/3 of the "full" distance
+ * 3: Process the main axes
+ * 3a: The main axes are (easily) viewable up to the first wall
+ * 3b: But never go more than the "full" distance
+ * 4: Process sequential "strips" in each of the eight octants
+ * 4a: Each strip runs along the previous strip
+ * 4b: The main axes are "previous" to the first strip
+ * 4c: Process both "sides" of each "direction" of each strip
+ * 4c1: Each side aborts as soon as possible
+ * 4c2: Each side tells the next strip how far it has to check
+ */
+void update_view(player_type *subject_ptr)
+{
+ int n, m, d, k, z;
+ POSITION y, x;
+
+ int se, sw, ne, nw, es, en, ws, wn;
+
+ int full, over;
+
+ floor_type *floor_ptr = subject_ptr->current_floor_ptr;
+ POSITION y_max = floor_ptr->height - 1;
+ POSITION x_max = floor_ptr->width - 1;
+
+ grid_type *g_ptr;
+ if (view_reduce_view && !floor_ptr->dun_level) {
+ full = MAX_SIGHT / 2;
+ over = MAX_SIGHT * 3 / 4;
+ } else {
+ full = MAX_SIGHT;
+ over = MAX_SIGHT * 3 / 2;
+ }
+
+ for (n = 0; n < floor_ptr->view_n; n++) {
+ y = floor_ptr->view_y[n];
+ x = floor_ptr->view_x[n];
+ g_ptr = &floor_ptr->grid_array[y][x];
+ g_ptr->info &= ~(CAVE_VIEW);
+ g_ptr->info |= CAVE_TEMP;
+ tmp_pos.y[tmp_pos.n] = y;
+ tmp_pos.x[tmp_pos.n] = x;
+ tmp_pos.n++;
+ }
+
+ floor_ptr->view_n = 0;
+ y = subject_ptr->y;
+ x = subject_ptr->x;
+ g_ptr = &floor_ptr->grid_array[y][x];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y, x);
+
+ z = full * 2 / 3;
+ for (d = 1; d <= z; d++) {
+ g_ptr = &floor_ptr->grid_array[y + d][x + d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y + d, x + d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ for (d = 1; d <= z; d++) {
+ g_ptr = &floor_ptr->grid_array[y + d][x - d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y + d, x - d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ for (d = 1; d <= z; d++) {
+ g_ptr = &floor_ptr->grid_array[y - d][x + d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y - d, x + d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ for (d = 1; d <= z; d++) {
+ g_ptr = &floor_ptr->grid_array[y - d][x - d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y - d, x - d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ for (d = 1; d <= full; d++) {
+ g_ptr = &floor_ptr->grid_array[y + d][x];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y + d, x);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ se = sw = d;
+ for (d = 1; d <= full; d++) {
+ g_ptr = &floor_ptr->grid_array[y - d][x];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y - d, x);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ ne = nw = d;
+ for (d = 1; d <= full; d++) {
+ g_ptr = &floor_ptr->grid_array[y][x + d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y, x + d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ es = en = d;
+ for (d = 1; d <= full; d++) {
+ g_ptr = &floor_ptr->grid_array[y][x - d];
+ g_ptr->info |= CAVE_XTRA;
+ cave_view_hack(floor_ptr, g_ptr, y, x - d);
+ if (!cave_los_grid(g_ptr))
+ break;
+ }
+
+ ws = wn = d;
+ for (n = 1; n <= over / 2; n++) {
+ POSITION ypn, ymn, xpn, xmn;
+ z = over - n - n;
+ if (z > full - n)
+ z = full - n;
+
+ while ((z + n + (n >> 1)) > full)
+ z--;
+
+ ypn = y + n;
+ ymn = y - n;
+ xpn = x + n;
+ xmn = x - n;
+ if (ypn < y_max) {
+ m = MIN(z, y_max - ypn);
+ if ((xpn <= x_max) && (n < se)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ypn + d, xpn, ypn + d - 1, xpn - 1, ypn + d - 1, xpn)) {
+ if (n + d >= se)
+ break;
+ } else
+ k = n + d;
+ }
+
+ se = k + 1;
+ }
+
+ if ((xmn >= 0) && (n < sw)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ypn + d, xmn, ypn + d - 1, xmn + 1, ypn + d - 1, xmn)) {
+ if (n + d >= sw)
+ break;
+ } else
+ k = n + d;
+ }
+
+ sw = k + 1;
+ }
+ }
+
+ if (ymn > 0) {
+ m = MIN(z, ymn);
+ if ((xpn <= x_max) && (n < ne)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ymn - d, xpn, ymn - d + 1, xpn - 1, ymn - d + 1, xpn)) {
+ if (n + d >= ne)
+ break;
+ } else
+ k = n + d;
+ }
+
+ ne = k + 1;
+ }
+
+ if ((xmn >= 0) && (n < nw)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ymn - d, xmn, ymn - d + 1, xmn + 1, ymn - d + 1, xmn)) {
+ if (n + d >= nw)
+ break;
+ } else
+ k = n + d;
+ }
+
+ nw = k + 1;
+ }
+ }
+
+ if (xpn < x_max) {
+ m = MIN(z, x_max - xpn);
+ if ((ypn <= x_max) && (n < es)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ypn, xpn + d, ypn - 1, xpn + d - 1, ypn, xpn + d - 1)) {
+ if (n + d >= es)
+ break;
+ } else
+ k = n + d;
+ }
+
+ es = k + 1;
+ }
+
+ if ((ymn >= 0) && (n < en)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ymn, xpn + d, ymn + 1, xpn + d - 1, ymn, xpn + d - 1)) {
+ if (n + d >= en)
+ break;
+ } else
+ k = n + d;
+ }
+
+ en = k + 1;
+ }
+ }
+
+ if (xmn > 0) {
+ m = MIN(z, xmn);
+ if ((ypn <= y_max) && (n < ws)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ypn, xmn - d, ypn - 1, xmn - d + 1, ypn, xmn - d + 1)) {
+ if (n + d >= ws)
+ break;
+ } else
+ k = n + d;
+ }
+
+ ws = k + 1;
+ }
+
+ if ((ymn >= 0) && (n < wn)) {
+ for (k = n, d = 1; d <= m; d++) {
+ if (update_view_aux(subject_ptr, ymn, xmn - d, ymn + 1, xmn - d + 1, ymn, xmn - d + 1)) {
+ if (n + d >= wn)
+ break;
+ } else
+ k = n + d;
+ }
+
+ wn = k + 1;
+ }
+ }
+ }
+
+ for (n = 0; n < floor_ptr->view_n; n++) {
+ y = floor_ptr->view_y[n];
+ x = floor_ptr->view_x[n];
+ g_ptr = &floor_ptr->grid_array[y][x];
+ g_ptr->info &= ~(CAVE_XTRA);
+ if (g_ptr->info & CAVE_TEMP)
+ continue;
+
+ cave_note_and_redraw_later(floor_ptr, g_ptr, y, x);
+ }
+
+ for (n = 0; n < tmp_pos.n; n++) {
+ y = tmp_pos.y[n];
+ x = tmp_pos.x[n];
+ g_ptr = &floor_ptr->grid_array[y][x];
+ g_ptr->info &= ~(CAVE_TEMP);
+ if (g_ptr->info & CAVE_VIEW)
+ continue;
+
+ cave_redraw_later(floor_ptr, g_ptr, y, x);
+ }
+
+ tmp_pos.n = 0;
+ subject_ptr->update |= PU_DELAY_VIS;
+}
--- /dev/null
+#pragma once
+
+#include "system/angband.h"
+
+void update_view(player_type *subject_ptr);
OSDN Git Service
