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] #38993 o_list と max_o_idx を floor_type に取り込む。 / Move o_list and max_o_idx...
[hengband/hengband.git]
/
src
/
spells2.c
diff --git
a/src/spells2.c
b/src/spells2.c
index
e53f275
..
e86bca3
100644
(file)
--- a/
src/spells2.c
+++ b/
src/spells2.c
@@
-179,7
+179,7
@@
bool detect_objects_gold(POSITION range)
/* Scan objects */
for (i = 1; i < o_max; i++)
{
/* Scan objects */
for (i = 1; i < o_max; i++)
{
- object_type *o_ptr = &o_list[i];
+ object_type *o_ptr = &
current_floor_ptr->
o_list[i];
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
@@
-234,7
+234,7
@@
bool detect_objects_normal(POSITION range)
/* Scan objects */
for (i = 1; i < o_max; i++)
{
/* Scan objects */
for (i = 1; i < o_max; i++)
{
- object_type *o_ptr = &o_list[i];
+ object_type *o_ptr = &
current_floor_ptr->
o_list[i];
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
@@
-297,7
+297,7
@@
bool detect_objects_magic(POSITION range)
/* Scan all objects */
for (i = 1; i < o_max; i++)
{
/* Scan all objects */
for (i = 1; i < o_max; i++)
{
- object_type *o_ptr = &o_list[i];
+ object_type *o_ptr = &
current_floor_ptr->
o_list[i];
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
/* Skip dead objects */
if (!o_ptr->k_idx) continue;
@@
-1490,7
+1490,7
@@
bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
- o_ptr = &o_list[this_o_idx];
+ o_ptr = &
current_floor_ptr->
o_list[this_o_idx];
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;