• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionfe6c6aa19e636c71f6a950dab8900c9b9d02dc6b (tree)
Time2019-02-26 23:33:08
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 誤った #define 適用を修正。 / Fix wrong #define applying. (A_MAX)

Change Summary

Incremental Difference

--- a/src/mane.c
+++ b/src/mane.c
@@ -787,7 +787,7 @@ static bool use_mane(int spell)
787787 int k;
788788 if (!target_set(TARGET_KILL)) return FALSE;
789789 msg_print(_("モンスターを召喚した!", "You summon monsters!"));
790- for (k = 0;k < A_MAX; k++)
790+ for (k = 0; k < 6; k++)
791791 summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
792792 break;
793793 }
@@ -796,7 +796,7 @@ static bool use_mane(int spell)
796796 int k;
797797 if (!target_set(TARGET_KILL)) return FALSE;
798798 msg_print(_("アリを召喚した。", "You summon ants."));
799- for (k = 0;k < A_MAX; k++)
799+ for (k = 0; k < 6; k++)
800800 summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode, '\0');
801801 break;
802802 }
@@ -805,7 +805,7 @@ static bool use_mane(int spell)
805805 int k;
806806 if (!target_set(TARGET_KILL)) return FALSE;
807807 msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
808- for (k = 0;k < A_MAX; k++)
808+ for (k = 0; k < 6; k++)
809809 summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode, '\0');
810810 break;
811811 }
@@ -814,7 +814,7 @@ static bool use_mane(int spell)
814814 int k;
815815 if (!target_set(TARGET_KILL)) return FALSE;
816816 msg_print(_("ハウンドを召喚した。", "You summon hounds."));
817- for (k = 0;k < 4; k++)
817+ for (k = 0; k < 4; k++)
818818 summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode, '\0');
819819 break;
820820 }
@@ -823,7 +823,7 @@ static bool use_mane(int spell)
823823 int k;
824824 if (!target_set(TARGET_KILL)) return FALSE;
825825 msg_print(_("ヒドラを召喚した。", "You summon hydras."));
826- for (k = 0;k < 4; k++)
826+ for (k = 0; k < 4; k++)
827827 summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode, '\0');
828828 break;
829829 }
@@ -832,7 +832,7 @@ static bool use_mane(int spell)
832832 int k;
833833 if (!target_set(TARGET_KILL)) return FALSE;
834834 msg_print(_("天使を召喚した!", "You summon angel!"));
835- for (k = 0;k < 1; k++)
835+ for (k = 0; k < 1; k++)
836836 summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode, '\0');
837837 break;
838838 }
@@ -841,7 +841,7 @@ static bool use_mane(int spell)
841841 int k;
842842 if (!target_set(TARGET_KILL)) return FALSE;
843843 msg_print(_("混沌の宮廷から悪魔を召喚した!", "You summon a demon from the Courts of Chaos!"));
844- for (k = 0;k < 1; k++)
844+ for (k = 0; k < 1; k++)
845845 summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode), '\0');
846846 break;
847847 }
@@ -850,7 +850,7 @@ static bool use_mane(int spell)
850850 int k;
851851 if (!target_set(TARGET_KILL)) return FALSE;
852852 msg_print(_("アンデッドの強敵を召喚した!", "You summon an undead adversary!"));
853- for (k = 0;k < 1; k++)
853+ for (k = 0; k < 1; k++)
854854 summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode), '\0');
855855 break;
856856 }
@@ -859,7 +859,7 @@ static bool use_mane(int spell)
859859 int k;
860860 if (!target_set(TARGET_KILL)) return FALSE;
861861 msg_print(_("ドラゴンを召喚した!", "You summon dragon!"));
862- for (k = 0;k < 1; k++)
862+ for (k = 0; k < 1; k++)
863863 summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode), '\0');
864864 break;
865865 }
@@ -868,7 +868,7 @@ static bool use_mane(int spell)
868868 int k;
869869 if (!target_set(TARGET_KILL)) return FALSE;
870870 msg_print(_("強力なアンデッドを召喚した!", "You summon greater undead!"));
871- for (k = 0;k < A_MAX; k++)
871+ for (k = 0; k < 6; k++)
872872 summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
873873 break;
874874 }
@@ -877,7 +877,7 @@ static bool use_mane(int spell)
877877 int k;
878878 if (!target_set(TARGET_KILL)) return FALSE;
879879 msg_print(_("古代ドラゴンを召喚した!", "You summon ancient dragons!"));
880- for (k = 0;k < 4; k++)
880+ for (k = 0; k < 4; k++)
881881 summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode), '\0');
882882 break;
883883 }
@@ -886,7 +886,7 @@ static bool use_mane(int spell)
886886 int k;
887887 if (!target_set(TARGET_KILL)) return FALSE;
888888 msg_print(_("アンバーの王族を召喚した!", "You summon Lords of Amber!"));
889- for (k = 0;k < 4; k++)
889+ for (k = 0; k < 4; k++)
890890 summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE), '\0');
891891 break;
892892 }
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -26,10 +26,11 @@
2626 * @param m_ptr 使用するモンスターの構造体参照ポインタ
2727 * @return ビームが到達可能ならばTRUEを返す
2828 */
29-static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
29+static bool direct_beam(POSITION y1, POSITION x1, POSITION y2, POSITION x2, monster_type *m_ptr)
3030 {
3131 bool hit2 = FALSE;
32- int i, y, x;
32+ int i;
33+ POSITION y, x;
3334
3435 int grid_n = 0;
3536 u16b grid_g[512];
Show on old repository browser