From 6599307eda98e10beaae211323166bad3a4664ab Mon Sep 17 00:00:00 2001 From: nothere Date: Fri, 26 Dec 2003 15:17:10 +0000 Subject: [PATCH] =?utf8?q?o=5Fptr->marked=E3=81=8C=E5=8D=98=E3=81=AB?= =?utf8?q?=E9=9D=9E0=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B=E5=88=A4=E5=AE=9A?= =?utf8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E9=83=A8=E5=88=86?= =?utf8?q?=E3=82=92,=20save.c=E3=81=AE=E7=89=A9=E4=BB=A5=E5=A4=96=E5=85=A8?= =?utf8?q?=20=E3=81=A6OM=5FFOUND=E3=81=A8=E3=81=AEAND=E6=BC=94=E7=AE=97?= =?utf8?q?=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88=E3=81=9F.=20?= =?utf8?q?=E3=81=BE=E3=81=9F,=20autopick.c=E3=81=AEOM=5FAUTODESTROY?= =?utf8?q?=E3=81=A8=20=E3=81=AEAND=E6=BC=94=E7=AE=97=E3=82=82=E5=BF=B5?= =?utf8?q?=E3=81=AE=E3=81=9F=E3=82=81=E6=8B=AC=E5=BC=A7=E3=81=A7=E6=8B=AC?= =?utf8?q?=E3=81=A3=E3=81=9F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 2 +- src/cave.c | 2 +- src/cmd1.c | 2 +- src/cmd2.c | 2 +- src/object1.c | 2 +- src/spells1.c | 8 ++++---- src/xtra2.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 0ba509655..c9e34b0c0 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -1628,7 +1628,7 @@ static void autopick_delayed_alter_aux(int item) /* Get the item (on the floor) */ else o_ptr = &o_list[0 - item]; - if (o_ptr->k_idx && o_ptr->marked & OM_AUTODESTROY) + if (o_ptr->k_idx && (o_ptr->marked & OM_AUTODESTROY)) { char o_name[MAX_NLEN]; diff --git a/src/cave.c b/src/cave.c index e6fadcb02..703b8ccb0 100644 --- a/src/cave.c +++ b/src/cave.c @@ -1216,7 +1216,7 @@ void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp) next_o_idx = o_ptr->next_o_idx; /* Memorized objects */ - if (o_ptr->marked) + if (o_ptr->marked & OM_FOUND) { if (display_autopick) { diff --git a/src/cmd1.c b/src/cmd1.c index 647f76638..cd197ffda 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -4640,7 +4640,7 @@ static bool run_test(void) next_o_idx = o_ptr->next_o_idx; /* Visible object */ - if (o_ptr->marked) return (TRUE); + if (o_ptr->marked & OM_FOUND) return (TRUE); } /* Assume unknown */ diff --git a/src/cmd2.c b/src/cmd2.c index da90f6826..7a1aeaec5 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -434,7 +434,7 @@ static s16b chest_check(int y, int x) next_o_idx = o_ptr->next_o_idx; /* Skip unknown chests XXX XXX */ - /* if (!o_ptr->marked) continue; */ + /* if (!(o_ptr->marked & OM_FOUND)) continue; */ /* Check for chest */ if (o_ptr->tval == TV_CHEST) return (this_o_idx); diff --git a/src/object1.c b/src/object1.c index 7e616555e..34132f595 100644 --- a/src/object1.c +++ b/src/object1.c @@ -6275,7 +6275,7 @@ int scan_floor(int *items, int y, int x, int mode) if ((mode & 0x01) && !item_tester_okay(o_ptr)) continue; /* Marked */ - if ((mode & 0x02) && !o_ptr->marked) continue; + if ((mode & 0x02) && !(o_ptr->marked & OM_FOUND)) continue; /* Accept this item */ /* XXX Hack -- Enforce limit */ diff --git a/src/spells1.c b/src/spells1.c index 478a8e44b..793793eea 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1452,7 +1452,7 @@ note_kill = " object_known(o_ptr); /* Notice */ - if (known && o_ptr->marked) + if (known && (o_ptr->marked & OM_FOUND)) { #ifdef JP msg_print("¥«¥Á¥Ã¤È²»¤¬¤·¤¿¡ª"); @@ -1521,7 +1521,7 @@ note_kill = " if (do_kill) { /* Effect "observed" */ - if (known && o_ptr->marked) + if (known && (o_ptr->marked & OM_FOUND)) { obvious = TRUE; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); @@ -1531,7 +1531,7 @@ note_kill = " if (is_art || ignore) { /* Observe the resist */ - if (known && o_ptr->marked) + if (known && (o_ptr->marked & OM_FOUND)) { #ifdef JP msg_format("%s¤Ï±Æ¶Á¤ò¼õ¤±¤Ê¤¤¡ª", @@ -1548,7 +1548,7 @@ msg_format("%s else { /* Describe if needed */ - if (known && o_ptr->marked && note_kill) + if (known && (o_ptr->marked & OM_FOUND) && note_kill) { #ifdef JP msg_format("%s¤Ï%s", o_name, note_kill); diff --git a/src/xtra2.c b/src/xtra2.c index d2625b40f..fd19f3cae 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2871,7 +2871,7 @@ static bool target_set_accept(int y, int x) next_o_idx = o_ptr->next_o_idx; /* Memorized object */ - if (o_ptr->marked) return (TRUE); + if (o_ptr->marked & OM_FOUND) return (TRUE); } /* Interesting memorized features */ @@ -3415,7 +3415,7 @@ static int target_set_aux(int y, int x, int mode, cptr info) next_o_idx = o_ptr->next_o_idx; /* Describe it */ - if (o_ptr->marked) + if (o_ptr->marked & OM_FOUND) { char o_name[MAX_NLEN]; -- 2.11.0