From ebf9ea173491ca6f55becf4a97fd27329ec7be09 Mon Sep 17 00:00:00 2001 From: nothere Date: Sat, 5 Jul 2003 15:56:52 +0000 Subject: [PATCH] =?utf8?q?=E9=8A=98=E3=82=92=E5=90=AB=E3=82=93=E3=81=A0?= =?utf8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=81=AE=E6=96=87=E5=AD=97?= =?utf8?q?=E5=88=97=E3=81=8C=E9=95=B7=E3=81=99=E3=81=8E=E3=82=8B=E3=81=A8,?= =?utf8?q?=20=E9=87=8D=E9=87=8F=E8=A1=A8=E7=A4=BA=E3=81=AE=E5=8F=B3?= =?utf8?q?=E3=81=AB=E3=82=B4=E3=83=9F=E3=81=8C=E5=87=BA=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=20=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3.=20?= =?utf8?q?=E3=81=BE=E3=81=9F,=20=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0?= =?utf8?q?=E4=B8=80=E8=A6=A7=E3=82=84=E8=A3=85=E5=82=99=E5=93=81=E4=B8=80?= =?utf8?q?=E8=A6=A7=E3=81=AE=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6?= =?utf8?q?=E5=B9=85=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=A6=E3=82=82?= =?utf8?q?=20=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=8F=8D=E6=98=A0=E3=81=95?= =?utf8?q?=E3=82=8C=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=83=90=E3=82=B0?= =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/object1.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/object1.c b/src/object1.c index 12c911001..72174a775 100644 --- a/src/object1.c +++ b/src/object1.c @@ -4404,7 +4404,10 @@ void display_inven(void) byte attr = TERM_WHITE; char tmp_val[80]; char o_name[MAX_NLEN]; + int wid, hgt; + /* Get size */ + Term_get_size(&wid, &hgt); /* Find the "final" slot */ for (i = 0; i < INVEN_PACK; i++) @@ -4471,12 +4474,12 @@ void display_inven(void) sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10); #endif - Term_putstr(71, i, -1, TERM_WHITE, tmp_val); + prt(tmp_val, i, wid - 9); } } /* Erase the rest of the window */ - for (i = z; i < Term->hgt; i++) + for (i = z; i < hgt; i++) { /* Erase the line */ Term_erase(0, i, 255); @@ -4495,7 +4498,10 @@ void display_equip(void) byte attr = TERM_WHITE; char tmp_val[80]; char o_name[MAX_NLEN]; + int wid, hgt; + /* Get size */ + Term_get_size(&wid, &hgt); /* Display the equipment */ for (i = INVEN_RARM; i < INVEN_TOTAL; i++) @@ -4550,30 +4556,29 @@ void display_equip(void) /* Erase the rest of the line */ Term_erase(3+n, i - INVEN_RARM, 255); - /* Display the slot description (if needed) */ - if (show_labels) - { - Term_putstr(61, i - INVEN_RARM, -1, TERM_WHITE, "<--"); - Term_putstr(65, i - INVEN_RARM, -1, TERM_WHITE, mention_use(i)); - } - /* Display the weight (if needed) */ if (show_weights && o_ptr->weight) { int wgt = o_ptr->weight * o_ptr->number; - int col = (show_labels ? 52 : 71); #ifdef JP sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt)); #else sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10); #endif - Term_putstr(col, i - INVEN_RARM, -1, TERM_WHITE, tmp_val); + prt(tmp_val, i - INVEN_RARM, wid - (show_labels ? 28 : 9)); + } + + /* Display the slot description (if needed) */ + if (show_labels) + { + Term_putstr(wid - 20, i - INVEN_RARM, -1, TERM_WHITE, " <-- "); + prt(mention_use(i), i - INVEN_RARM, wid - 15); } } /* Erase the rest of the window */ - for (i = INVEN_TOTAL - INVEN_RARM; i < Term->hgt; i++) + for (i = INVEN_TOTAL - INVEN_RARM; i < hgt; i++) { /* Clear that line */ Term_erase(0, i, 255); @@ -4873,7 +4878,7 @@ int show_inven(int target_item) (void)sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10); #endif - put_str(tmp_val, j + 1, wid - 9); + prt(tmp_val, j + 1, wid - 9); } } @@ -5075,7 +5080,7 @@ int show_equip(int target_item) (void)sprintf(tmp_val, "%3d.%d lb", wgt / 10, wgt % 10); #endif - put_str(tmp_val, j+1, wid - 9); + prt(tmp_val, j + 1, wid - 9); } } @@ -6314,7 +6319,7 @@ int show_floor(int target_item, int y, int x, int *min_width) sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10); #endif - put_str(tmp_val, j + 1, wid - 9); + prt(tmp_val, j + 1, wid - 9); } } -- 2.11.0