(2.2.0.17) avater.cとeffect.c内のC4457警告に対応。 / Deal C4457 warning in avater.c, effect.c.

diff --git a/src/avatar.c b/src/avatar.c
index 71729c0..270f1d1 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -399,13 +399,13 @@ void get_virtues(void)
  * @param amount 加減量
  * @return なし
  */
-void chg_virtue(int virtue, int amount)
+void chg_virtue(int virtue_id, int amount)
 {
        int i = 0;
 
        for (i = 0; i < 8; i++)
        {
-               if (p_ptr->vir_types[i] == virtue)
+               if (p_ptr->vir_types[i] == virtue_id)
                {
                        if (amount > 0)
                        {
@@ -463,13 +463,13 @@ void chg_virtue(int virtue, int amount)
  * @param amount セットしたい値。
  * @return なし
  */
-void set_virtue(int virtue, int amount)
+void set_virtue(int virtue_id, int amount)
 {
        int i = 0;
 
        for (i = 0; i < 8; i++)
        {
-               if (p_ptr->vir_types[i] == virtue)
+               if (p_ptr->vir_types[i] == virtue_id)
                {
                        p_ptr->virtues[i] = amount;
                        return;
@@ -490,40 +490,40 @@ void dump_virtues(FILE *OutFile)
 
        for (v_nr = 0; v_nr < 8; v_nr++)
        {
-               char v_name [20];
+               char vir_name [20];
                int tester = p_ptr->virtues[v_nr];
 
-               strcpy(v_name, virtue[(p_ptr->vir_types[v_nr])-1]);
+               strcpy(vir_name, virtue[(p_ptr->vir_types[v_nr])-1]);
 
                if (p_ptr->vir_types[v_nr] == 0 || p_ptr->vir_types[v_nr] > MAX_VIRTUE)
-                       fprintf(OutFile, _("おっと。%sの情報なし。", "Oops. No info about %s."), v_name);
+                       fprintf(OutFile, _("おっと。%sの情報なし。", "Oops. No info about %s."), vir_name);
 
                else if (tester < -100)
-                       fprintf(OutFile, _("[%s]の対極", "You are the polar opposite of %s."), v_name);
+                       fprintf(OutFile, _("[%s]の対極", "You are the polar opposite of %s."), vir_name);
                else if (tester < -80)
-                       fprintf(OutFile, _("[%s]の大敵", "You are an arch-enemy of %s."), v_name);
+                       fprintf(OutFile, _("[%s]の大敵", "You are an arch-enemy of %s."), vir_name);
                else if (tester < -60)
-                       fprintf(OutFile, _("[%s]の強敵", "You are a bitter enemy of %s."), v_name);
+                       fprintf(OutFile, _("[%s]の強敵", "You are a bitter enemy of %s."), vir_name);
                else if (tester < -40)
-                       fprintf(OutFile, _("[%s]の敵", "You are an enemy of %s."), v_name);
+                       fprintf(OutFile, _("[%s]の敵", "You are an enemy of %s."), vir_name);
                else if (tester < -20)
-                       fprintf(OutFile, _("[%s]の罪者", "You have sinned against %s."), v_name);
+                       fprintf(OutFile, _("[%s]の罪者", "You have sinned against %s."), vir_name);
                else if (tester < 0)
-                       fprintf(OutFile, _("[%s]の迷道者", "You have strayed from the path of %s."), v_name);
+                       fprintf(OutFile, _("[%s]の迷道者", "You have strayed from the path of %s."), vir_name);
                else if (tester == 0)
-                       fprintf(OutFile,_("[%s]の中立者", "You are neutral to %s."), v_name);
+                       fprintf(OutFile,_("[%s]の中立者", "You are neutral to %s."), vir_name);
                else if (tester < 20)
-                       fprintf(OutFile,_("[%s]の小徳者", "You are somewhat virtuous in %s."), v_name);
+                       fprintf(OutFile,_("[%s]の小徳者", "You are somewhat virtuous in %s."), vir_name);
                else if (tester < 40)
-                       fprintf(OutFile,_("[%s]の中徳者", "You are virtuous in %s."), v_name);
+                       fprintf(OutFile,_("[%s]の中徳者", "You are virtuous in %s."), vir_name);
                else if (tester < 60)
-                       fprintf(OutFile,_("[%s]の高徳者", "You are very virtuous in %s."), v_name);
+                       fprintf(OutFile,_("[%s]の高徳者", "You are very virtuous in %s."), vir_name);
                else if (tester < 80)
-                       fprintf(OutFile,_("[%s]の覇者", "You are a champion of %s."), v_name);
+                       fprintf(OutFile,_("[%s]の覇者", "You are a champion of %s."), vir_name);
                else if (tester < 100)
-                       fprintf(OutFile,_("[%s]の偉大な覇者", "You are a great champion of %s."), v_name);
+                       fprintf(OutFile,_("[%s]の偉大な覇者", "You are a great champion of %s."), vir_name);
                else
-                       fprintf(OutFile,_("[%s]の具現者", "You are the living embodiment of %s."), v_name);
+                       fprintf(OutFile,_("[%s]の具現者", "You are the living embodiment of %s."), vir_name);
 
            fprintf(OutFile, "\n");
        }

diff --git a/src/defines.h b/src/defines.h
index 49540b6..61183f9 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -53,7 +53,7 @@
 #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */
 #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */
 #define FAKE_VER_PATCH 0 /*!< ゲームのバージョン番号定義(パッチ番号) */
-#define FAKE_VER_EXTRA 16 /*!< ゲームのバージョン番号定義(エクストラ番号) */
+#define FAKE_VER_EXTRA 17 /*!< ゲームのバージョン番号定義(エクストラ番号) */
 
 
  /*!

diff --git a/src/effects.c b/src/effects.c
index 9855b6f..f8ccca0 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -5163,7 +5163,7 @@ bool choose_ele_attack(void)
 /*
  * Choose a elemental immune. -LM-
  */
-bool choose_ele_immune(int turn)
+bool choose_ele_immune(int immune_turn)
 {
        char choice;
 
@@ -5186,13 +5186,13 @@ bool choose_ele_immune(int turn)
        choice = inkey();
 
        if ((choice == 'a') || (choice == 'A')) 
-               set_ele_immune(DEFENSE_FIRE, turn);
+               set_ele_immune(DEFENSE_FIRE, immune_turn);
        else if ((choice == 'b') || (choice == 'B'))
-               set_ele_immune(DEFENSE_COLD, turn);
+               set_ele_immune(DEFENSE_COLD, immune_turn);
        else if ((choice == 'c') || (choice == 'C'))
-               set_ele_immune(DEFENSE_ACID, turn);
+               set_ele_immune(DEFENSE_ACID, immune_turn);
        else if ((choice == 'd') || (choice == 'D'))
-               set_ele_immune(DEFENSE_ELEC, turn);
+               set_ele_immune(DEFENSE_ELEC, immune_turn);
        else
        {
                msg_print(_("免疫を付けるのをやめた。", "You cancel the temporary immune."));