OSDN Git Service

[Refactor] #38997 purchase_analyze() にplayer_type * 引数を追加 / Added player_type * argum...
authorHourier <hourier@users.sourceforge.jp>
Mon, 13 Jan 2020 10:51:22 +0000 (19:51 +0900)
committerHourier <hourier@users.sourceforge.jp>
Mon, 13 Jan 2020 10:51:22 +0000 (19:51 +0900)
src/store.c

index 6be70cc..e0b33b1 100644 (file)
@@ -1888,14 +1888,14 @@ static concptr comment_7d[MAX_COMMENT_7D] =
  * @details 
  * We paid "price", it was worth "value", and we thought it was worth "guess"
  */
-static void purchase_analyze(PRICE price, PRICE value, PRICE guess)
+static void purchase_analyze(player_type *player_ptr, PRICE price, PRICE value, PRICE guess)
 {
        /* Item was worthless, but we bought it */
        if ((value <= 0) && (price > value))
        {
                msg_print(comment_7a[randint0(MAX_COMMENT_7A)]);
-               chg_virtue(p_ptr, V_HONOUR, -1);
-               chg_virtue(p_ptr, V_JUSTICE, -1);
+               chg_virtue(player_ptr, V_HONOUR, -1);
+               chg_virtue(player_ptr, V_JUSTICE, -1);
                sound(SOUND_STORE1);
        }
 
@@ -1903,8 +1903,8 @@ static void purchase_analyze(PRICE price, PRICE value, PRICE guess)
        else if ((value < guess) && (price > value))
        {
                msg_print(comment_7b[randint0(MAX_COMMENT_7B)]);
-               chg_virtue(p_ptr, V_JUSTICE, -1);
-               if (one_in_(4)) chg_virtue(p_ptr, V_HONOUR, -1);
+               chg_virtue(player_ptr, V_JUSTICE, -1);
+               if (one_in_(4)) chg_virtue(player_ptr, V_HONOUR, -1);
                sound(SOUND_STORE2);
        }
 
@@ -1912,8 +1912,8 @@ static void purchase_analyze(PRICE price, PRICE value, PRICE guess)
        else if ((value > guess) && (value < (4 * guess)) && (price < value))
        {
                msg_print(comment_7c[randint0(MAX_COMMENT_7C)]);
-               if (one_in_(4)) chg_virtue(p_ptr, V_HONOUR, -1);
-               else if (one_in_(4)) chg_virtue(p_ptr, V_HONOUR, 1);
+               if (one_in_(4)) chg_virtue(player_ptr, V_HONOUR, -1);
+               else if (one_in_(4)) chg_virtue(player_ptr, V_HONOUR, 1);
                sound(SOUND_STORE3);
        }
 
@@ -1921,9 +1921,9 @@ static void purchase_analyze(PRICE price, PRICE value, PRICE guess)
        else if ((value > guess) && (price < value))
        {
                msg_print(comment_7d[randint0(MAX_COMMENT_7D)]);
-               if (one_in_(2)) chg_virtue(p_ptr, V_HONOUR, -1);
-               if (one_in_(4)) chg_virtue(p_ptr, V_HONOUR, 1);
-               if (10 * price < value) chg_virtue(p_ptr, V_SACRIFICE, 1);
+               if (one_in_(2)) chg_virtue(player_ptr, V_HONOUR, -1);
+               if (one_in_(4)) chg_virtue(player_ptr, V_HONOUR, 1);
+               if (10 * price < value) chg_virtue(player_ptr, V_SACRIFICE, 1);
                sound(SOUND_STORE4);
        }
 }
@@ -5076,7 +5076,7 @@ static void store_sell(player_type *owner_ptr)
                        if (!((o_ptr->tval == TV_FIGURINE) && (value > 0)))
                        {
                         /* Analyze the prices (and comment verbally) unless a figurine*/
-                       purchase_analyze(price, value, dummy);
+                       purchase_analyze(owner_ptr, price, value, dummy);
                        }
 
                        /*