From 8a3d8f3ef56b15c3e4c4fe0bed2f1e28e3fa3ebd Mon Sep 17 00:00:00 2001 From: mogami Date: Tue, 30 Apr 2002 14:32:33 +0000 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=83=A1?= =?utf8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E4=B8=AD=E3=81=A7=E3=82=A2=E3=82=A4?= =?utf8?q?=E3=83=86=E3=83=A0=E3=82=92=E9=81=B8=E6=8A=9E=E4=B8=AD=E3=81=AB?= =?utf8?q?=E5=BA=8A=E4=B8=8A=E3=81=AE=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0?= =?utf8?q?=E3=82=92=E9=81=B8=E6=8A=9E=E3=81=99=E3=82=8B=E9=9A=9B=E3=81=AE?= =?utf8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE=E6=AD=A3=E3=80=82=20-=20eas?= =?utf8?q?y=5Ffloor=E3=81=8C=E3=82=AA=E3=83=95=E3=81=A7=E3=82=82=E3=83=A1?= =?utf8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E4=BD=BF=E7=94=A8=E4=B8=AD=E3=81=AFg?= =?utf8?q?et=5Fitem=5Ffloor()=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=20-=204=20or=206=20for=20fl?= =?utf8?q?oor=20=E7=AD=89=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=82=92=E8=8B=B1?= =?utf8?q?=E8=AA=9E=E7=89=88=E3=81=A7=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E8=BF=BD=E5=8A=A0=E3=80=82=20-=20?= =?utf8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E7=89=88=E3=81=A7=E3=82=82=E4=B8=80?= =?utf8?q?=E7=AE=87=E6=89=80=E3=81=A0=E3=81=91=E8=A1=A8=E7=A4=BA=E3=81=8C?= =?utf8?q?=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?utf8?q?=E3=82=92=E5=AE=88=E5=8B=A2=E3=80=82=E3=82=B3=E3=83=BC=E3=83=89?= =?utf8?q?=E6=95=B4=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/object1.c | 213 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 117 insertions(+), 96 deletions(-) diff --git a/src/object1.c b/src/object1.c index 53596b436..11f56a4df 100644 --- a/src/object1.c +++ b/src/object1.c @@ -5109,7 +5109,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode) #ifdef ALLOW_EASY_FLOOR /* TNB */ - if (easy_floor) return get_item_floor(cp, pmt, str, mode); + if (easy_floor || use_menu) return get_item_floor(cp, pmt, str, mode); #endif /* ALLOW_EASY_FLOOR -- TNB */ @@ -5236,7 +5236,6 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode) } } - /* Require at least one legal choice */ if (!allow_floor && (i1 > i2) && (e1 > e2)) { @@ -5543,22 +5542,31 @@ if (allow_floor) strcat(out_val, " '-' case '\r': case '\n': { - /* Validate the item */ - if (!get_item_okay(get_item_label)) + if (command_wrk == USE_FLOOR) { - bell(); - break; + /* Special index */ + (*cp) = -get_item_label; } - - /* Allow player to "refuse" certain actions */ - if (!get_item_allow(get_item_label)) + else { - done = TRUE; - break; + /* Validate the item */ + if (!get_item_okay(get_item_label)) + { + bell(); + break; + } + + /* Allow player to "refuse" certain actions */ + if (!get_item_allow(get_item_label)) + { + done = TRUE; + break; + } + + /* Accept that choice */ + (*cp) = get_item_label; } - /* Accept that choice */ - (*cp) = get_item_label; item = TRUE; done = TRUE; break; @@ -6425,51 +6433,50 @@ if (!command_see && !use_menu) strcat(out_val, " '*' /* Append */ #ifdef JP -if (allow_equip) -{ - if (use_menu) - { - if (allow_floor) - strcat(out_val, " '6' ÁõÈ÷ÉÊ,"); - else - strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,"); - } - else strcat(out_val, " '/' ÁõÈ÷ÉÊ,"); -} -else if (select_the_force) - strcat(out_val, " 'w'Îýµ¤½Ñ,"); + if (allow_equip) + { + if (!use_menu) + strcat(out_val, " '/' ÁõÈ÷ÉÊ,"); + else if (allow_floor) + strcat(out_val, " '6' ÁõÈ÷ÉÊ,"); + else + strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,"); + } + else if (select_the_force) + strcat(out_val, " 'w'Îýµ¤½Ñ,"); #else -if (allow_equip) -{ - if (use_menu) - { - if (allow_floor) - strcat(out_val, " 6 for Equip,"); - else - strcat(out_val, " 4 or 6 for Equip,"); - } - else strcat(out_val, " / for Equip,"); -} -else if (select_the_force) - strcat(out_val, " w for the Force,"); + if (allow_equip) + { + if (!use_menu) + strcat(out_val, " / for Equip,"); + else if (allow_floor) + strcat(out_val, " 6 for Equip,"); + else + strcat(out_val, " 4 or 6 for Equip,"); + } + else if (select_the_force) + strcat(out_val, " w for the Force,"); #endif /* Append */ + if (allow_floor) + { #ifdef JP -if (allow_floor) -{ - if (use_menu) - { - if (allow_equip) - strcat(out_val, " '4' ¾²¾å,"); - else - strcat(out_val, " '4'or'6' ¾²¾å,"); - } - else strcat(out_val, " '-'¾²¾å,"); -} + if (!use_menu) + strcat(out_val, " '-'¾²¾å,"); + if (allow_equip) + strcat(out_val, " '4' ¾²¾å,"); + else + strcat(out_val, " '4'or'6' ¾²¾å,"); #else - if (allow_floor) strcat(out_val, " - for floor,"); + if (!use_menu) + strcat(out_val, " - for floor,"); + if (allow_equip) + strcat(out_val, " 4 for floor,"); + else + strcat(out_val, " 4 or 6 for floor,"); #endif + } } @@ -6508,40 +6515,45 @@ if (!command_see && !use_menu) strcat(out_val, " '*' /* Append */ + if (allow_inven) + { #ifdef JP -if (allow_inven) -{ - if (use_menu) - { - if (allow_floor) - strcat(out_val, " '4' »ý¤Áʪ,"); - else - strcat(out_val, " '4'or'6' »ý¤Áʪ,"); - } - else strcat(out_val, " '/' »ý¤Áʪ,"); -} + if (!use_menu) + strcat(out_val, " '/' »ý¤Áʪ,"); + else if (allow_floor) + strcat(out_val, " '4' »ý¤Áʪ,"); + else + strcat(out_val, " '4'or'6' »ý¤Áʪ,"); #else - if (allow_inven) strcat(out_val, " / for Inven,"); -#endif + if (!use_menu) + strcat(out_val, " / for Inven,"); + else if (allow_floor) + strcat(out_val, " 4 for Inven,"); + else + strcat(out_val, " 4 or 6 for Inven,"); +#endif + } /* Append */ + if (allow_floor) + { #ifdef JP -if (allow_floor) -{ - if (use_menu) - { - if (allow_floor) - strcat(out_val, " '6' ¾²¾å,"); - else - strcat(out_val, " '4'or'6' ¾²¾å,"); - } - else strcat(out_val, " '-'¾²¾å,"); -} + if (!use_menu) + strcat(out_val, " '-'¾²¾å,"); + else if (allow_inven) + strcat(out_val, " '6' ¾²¾å,"); + else + strcat(out_val, " '4'or'6' ¾²¾å,"); #else - if (allow_floor) strcat(out_val, " - for floor,"); + if (!use_menu) + strcat(out_val, " - for floor,"); + else if (allow_inven) + strcat(out_val, " 6 for floor,"); + else + strcat(out_val, " 4 or 6 for floor,"); #endif - + } } /* Viewing floor */ @@ -6582,27 +6594,27 @@ if (!command_see && !use_menu) strcat(out_val, " '*' if (allow_inven && allow_equip) { #ifdef JP -strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,"); + strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,"); #else - strcat(out_val, " / for Inven,"); + strcat(out_val, " 4 for Equip, 6 for Inven,"); #endif } else if (allow_inven) { #ifdef JP -strcat(out_val, " '4'or'6' »ý¤Áʪ,"); + strcat(out_val, " '4'or'6' »ý¤Áʪ,"); #else - strcat(out_val, " / for Inven,"); + strcat(out_val, " 4 or 6 for Inven,"); #endif } else if (allow_equip) { #ifdef JP -strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,"); + strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,"); #else - strcat(out_val, " / for Equip,"); + strcat(out_val, " 4 or 6 for Equip,"); #endif } @@ -6611,7 +6623,7 @@ strcat(out_val, " '4'or'6' else if (allow_inven) { #ifdef JP -strcat(out_val, " '/' »ý¤Áʪ,"); + strcat(out_val, " '/' »ý¤Áʪ,"); #else strcat(out_val, " / for Inven,"); #endif @@ -6620,7 +6632,7 @@ strcat(out_val, " '/' else if (allow_equip) { #ifdef JP -strcat(out_val, " '/'ÁõÈ÷ÉÊ,"); + strcat(out_val, " '/'ÁõÈ÷ÉÊ,"); #else strcat(out_val, " / for Equip,"); #endif @@ -6810,22 +6822,31 @@ strcat(out_val, " '/' case '\r': case '\n': { - /* Validate the item */ - if (!get_item_okay(get_item_label)) + if (command_wrk == USE_FLOOR) { - bell(); - break; + /* Special index */ + (*cp) = -get_item_label; } - - /* Allow player to "refuse" certain actions */ - if (!get_item_allow(get_item_label)) + else { - done = TRUE; - break; + /* Validate the item */ + if (!get_item_okay(get_item_label)) + { + bell(); + break; + } + + /* Allow player to "refuse" certain actions */ + if (!get_item_allow(get_item_label)) + { + done = TRUE; + break; + } + + /* Accept that choice */ + (*cp) = get_item_label; } - /* Accept that choice */ - (*cp) = get_item_label; item = TRUE; done = TRUE; break; -- 2.11.0