From 260e0fbd67f6abec7c0d6ce07158590e57ea64ae Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 20 Dec 2018 22:45:43 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#37551=20=E6=AD=A6=E5=99=A8=E4=BF=AE?= =?utf8?q?=E5=BE=A9=E6=99=82=E3=81=AE=E9=87=8D=E9=87=8F=E8=A8=88=E7=AE=97?= =?utf8?q?=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20/=20Fix?= =?utf8?q?=20calculation=20on=20broken=20weapon=20reforging.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/bldg.c | 5 ++++- src/mspells3.c | 15 +++++++-------- src/object2.c | 3 +-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index cefdd582d..9a41229d4 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -3089,6 +3089,8 @@ static PRICE repair_broken_weapon_aux(PRICE bcost) return (0); } + p_ptr->total_weight -= o_ptr->weight; + if (o_ptr->sval == SV_BROKEN_DAGGER) { IDX j; @@ -3187,7 +3189,6 @@ static PRICE repair_broken_weapon_aux(PRICE bcost) } } - /* */ if (have_flag(k_ptr->flags, TR_BLOWS)) { int bmax = MIN(3, MAX(1, 40 / (o_ptr->dd * o_ptr->ds))); @@ -3243,6 +3244,8 @@ static PRICE repair_broken_weapon_aux(PRICE bcost) /* Add repaired flag */ o_ptr->discount = 99; + p_ptr->total_weight += o_ptr->weight; + /* Decrease material object */ inven_item_increase(mater, -1); inven_item_optimize(mater); diff --git a/src/mspells3.c b/src/mspells3.c index d31459318..8017c0fb2 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -199,12 +199,12 @@ static void learned_info(char *p, int power) * when you run it. It's probably easy to fix but I haven't tried,\n * sorry.\n */ -static int get_learned_power(SPELL_IDX *sn) +static bool get_learned_power(SPELL_IDX *sn) { int i = 0; int num = 0; - int y = 1; - int x = 18; + TERM_LEN y = 1; + TERM_LEN x = 18; PERCENTAGE minfail = 0; PLAYER_LEVEL plev = p_ptr->lev; PERCENTAGE chance = 0; @@ -214,8 +214,8 @@ static int get_learned_power(SPELL_IDX *sn) char choice; char out_val[160]; char comment[80]; - s32b f4 = 0, f5 = 0, f6 = 0; - cptr p = _("魔法", "magic"); + BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L; + cptr p = _("魔法", "magic"); COMMAND_CODE code; monster_power spell; bool flag, redraw; @@ -345,9 +345,8 @@ static int get_learned_power(SPELL_IDX *sn) } /* Build a prompt (accept all spells) */ - (void)strnfmt(out_val, 78, - _("(%c-%c, '*'で一覧, ESC) どの%sを唱えますか？", "(%c-%c, *=List, ESC=exit) Use which %s? "), - I2A(0), I2A(num - 1), p); + (void)strnfmt(out_val, 78, _("(%c-%c, '*'で一覧, ESC) どの%sを唱えますか？", "(%c-%c, *=List, ESC=exit) Use which %s? "), + I2A(0), I2A(num - 1), p); if (use_menu) screen_save(); diff --git a/src/object2.c b/src/object2.c index 2071eb865..990b5f1f0 100644 --- a/src/object2.c +++ b/src/object2.c @@ -5330,8 +5330,7 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION #ifdef JP msg_format("%sは消えた。", o_name); #else - msg_format("The %s disappear%s.", - o_name, (plural ? "" : "s")); + msg_format("The %s disappear%s.", o_name, (plural ? "" : "s")); #endif -- 2.11.0