Avoid reserved words of C++

[hengband/hengband.git] / src / spells1.c

diff --git a/src/spells1.c b/src/spells1.c
index e1887b2..c47957b 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1782,7 +1782,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 #endif
 
 
-       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Analyze the damage type */
        switch (typ)
@@ -6424,7 +6424,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
 
-               disturb(1, 0);
+               disturb(1, 1);
                return TRUE;
        }
 
@@ -6498,7 +6498,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (fuzzy) msg_print("You are hit by acid!");
 #endif
                        
-                       get_damage = acid_dam(dam, killer, monspell);
+                       get_damage = acid_dam(dam, killer, monspell, FALSE);
                        break;
                }
 
@@ -6511,7 +6511,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (fuzzy) msg_print("You are hit by fire!");
 #endif
 
-                       get_damage = fire_dam(dam, killer, monspell);
+                       get_damage = fire_dam(dam, killer, monspell, FALSE);
                        break;
                }
 
@@ -6524,7 +6524,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (fuzzy) msg_print("You are hit by cold!");
 #endif
 
-                       get_damage = cold_dam(dam, killer, monspell);
+                       get_damage = cold_dam(dam, killer, monspell, FALSE);
                        break;
                }
 
@@ -6537,7 +6537,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (fuzzy) msg_print("You are hit by lightning!");
 #endif
 
-                       get_damage = elec_dam(dam, killer, monspell);
+                       get_damage = elec_dam(dam, killer, monspell, FALSE);
                        break;
                }
 
@@ -7348,7 +7348,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (fuzzy) msg_print("You are hit by something sharp and cold!");
 #endif
 
-                       get_damage = cold_dam(dam, killer, monspell);
+                       get_damage = cold_dam(dam, killer, monspell, FALSE);
                        if (!CHECK_MULTISHADOW())
                        {
                                if (!p_ptr->resist_shard)
@@ -7743,7 +7743,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 
        /* Disturb */
-       disturb(1, 0);
+       disturb(1, 1);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))