Changed the English description of Wahha-man: interpolated between what was there...

[hengbandforosx/hengbandosx.git] / src / view-mainwindow.c

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 9930e4a..4a6cdf1 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -16,6 +16,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "monster.h"
 
  /*
   * Some screen locations for various display routines
@@ -98,92 +99,6 @@
 #define ROW_STATBAR             (-1)
 #define COL_STATBAR              0
 #define MAX_COL_STATBAR         (-26)
-/*!
- * @brief 現在の修正後能力値を3～17及び18/xxx形式に変換する / Converts stat num into a six-char (right justified) string
- * @param val 能力値
- * @param out_val 出力先文字列ポインタ
- * @return なし
- */
-void cnv_stat(int val, char *out_val)
-{
-       /* Above 18 */
-       if (val > 18)
-       {
-               int bonus = (val - 18);
-
-               if (bonus >= 220)
-               {
-                       sprintf(out_val, "18/%3s", "***");
-               }
-               else if (bonus >= 100)
-               {
-                       sprintf(out_val, "18/%03d", bonus);
-               }
-               else
-               {
-                       sprintf(out_val, " 18/%02d", bonus);
-               }
-       }
-
-       /* From 3 to 18 */
-       else
-       {
-               sprintf(out_val, "    %2d", val);
-       }
-}
-
-/*!
- * @brief 能力値現在値から3～17及び18/xxx様式に基づく加減算を行う。
- * Modify a stat value by a "modifier", return new value
- * @param value 現在値
- * @param amount 加減算値
- * @return 加減算後の値
- * @details
- * <pre>
- * Stats go up: 3,4,...,17,18,18/10,18/20,...,18/220
- * Or even: 18/13, 18/23, 18/33, ..., 18/220
- * Stats go down: 18/220, 18/210,..., 18/10, 18, 17, ..., 3
- * Or even: 18/13, 18/03, 18, 17, ..., 3
- * </pre>
- */
-s16b modify_stat_value(int value, int amount)
-{
-       int    i;
-
-       /* Reward */
-       if (amount > 0)
-       {
-               /* Apply each point */
-               for (i = 0; i < amount; i++)
-               {
-                       /* One point at a time */
-                       if (value < 18) value++;
-
-                       /* Ten "points" at a time */
-                       else value += 10;
-               }
-       }
-
-       /* Penalty */
-       else if (amount < 0)
-       {
-               /* Apply each point */
-               for (i = 0; i < (0 - amount); i++)
-               {
-                       /* Ten points at a time */
-                       if (value >= 18+10) value -= 10;
-
-                       /* Hack -- prevent weirdness */
-                       else if (value > 18) value = 18;
-
-                       /* One point at a time */
-                       else if (value > 3) value--;
-               }
-       }
-
-       /* Return new value */
-       return (s16b)(value);
-}
 
 
 
@@ -823,7 +738,7 @@ static void prt_level(void)
 {
        char tmp[32];
 
-       sprintf(tmp, _("%5d", "%6d"), p_ptr->lev);
+       sprintf(tmp, "%5d", p_ptr->lev);
 
        if (p_ptr->lev >= p_ptr->max_plv)
        {
@@ -2513,7 +2428,6 @@ bool change_panel(POSITION dy, POSITION dx)
                panel_row_min = y;
                panel_col_min = x;
 
-               /* Recalculate the boundaries */
                panel_bounds_center();
 
                p_ptr->update |= (PU_MONSTERS);