| Revision | 67d0906c3669458b8ef20c3beaddba89d9f4253d (tree) |
|---|---|
| Time | 2002-11-15 16:05:42 |
| Author | mogami <mogami@0568...> |
| Commiter | mogami |
魔力喰いで失敗してロッドが壊れたとき、残りのロッドのtimeoutが異常になるバグ修正。
またデバッグコマンド使用中に見付けたo_ptr->pvalをロッドの古い仕様に添って
書き変えていた古いコード削除。
src/spells3.c (diff) src/wizard2.c (diff)| @@ -5906,8 +5906,8 @@ msg_format(" | ||
| 5906 | 5906 | #endif |
| 5907 | 5907 | |
| 5908 | 5908 | /* Reduce rod stack maximum timeout, drain wands. */ |
| 5909 | - if (o_ptr->tval == TV_ROD) o_ptr->timeout -= k_ptr->pval; | |
| 5910 | - if (o_ptr->tval == TV_WAND) o_ptr->pval = o_ptr->pval * (o_ptr->number - 1) / o_ptr->number; | |
| 5909 | + if (o_ptr->tval == TV_ROD) o_ptr->timeout = MIN(o_ptr->timeout, k_ptr->pval * (o_ptr->number - 1)); | |
| 5910 | + else if (o_ptr->tval == TV_WAND) o_ptr->pval = o_ptr->pval * (o_ptr->number - 1) / o_ptr->number; | |
| 5911 | 5911 | |
| 5912 | 5912 | } |
| 5913 | 5913 | else |
| @@ -1177,10 +1177,6 @@ static void wiz_quantity_item(object_type *o_ptr) | ||
| 1177 | 1177 | |
| 1178 | 1178 | /* Accept modifications */ |
| 1179 | 1179 | o_ptr->number = tmp_int; |
| 1180 | - | |
| 1181 | - /* Hack -- rod pvals must change if the number in the stack does. -LM- */ | |
| 1182 | - if (o_ptr->tval == TV_ROD) | |
| 1183 | - o_ptr->pval = o_ptr->pval * o_ptr->number / tmp_qnt; | |
| 1184 | 1180 | } |
| 1185 | 1181 | } |
| 1186 | 1182 |
Fork