OSDN Git Service

Changed to avoid clang's "equality comparison with extraneous parentheses" warnings.
authorEric Branlund <ebranlund@fastmail.com>
Fri, 18 Dec 2020 18:01:55 +0000 (10:01 -0800)
committerEric Branlund <ebranlund@fastmail.com>
Fri, 18 Dec 2020 18:01:55 +0000 (10:01 -0800)
src/grid/trap.c
src/inventory/inventory-damage.c
src/mspell/mspell-dispel.c
src/mspell/mspell-floor.c
src/object/item-tester-hooker.c

index b166bbc..7e3d598 100644 (file)
@@ -424,7 +424,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
             msg_print(_("落とし戸に落ちた!", "You have fallen through a trap door!"));
             if (is_echizen(trapped_ptr))
                 msg_print(_("くっそ~!", ""));
-            else if ((trapped_ptr->pseikaku == PERSONALITY_CHARGEMAN))
+            else if (trapped_ptr->pseikaku == PERSONALITY_CHARGEMAN)
                 msg_print(_("ジュラル星人の仕業に違いない!", ""));
 
             sound(SOUND_FALL);
index 7e1e00f..8d3564a 100644 (file)
@@ -71,7 +71,7 @@ void inventory_damage(player_type *player_ptr, inven_func typ, int perc)
 #ifdef JP
         if (is_echizen(player_ptr))
             msg_print("やりやがったな!");
-        else if ((player_ptr->pseikaku == PERSONALITY_CHARGEMAN)) {
+        else if (player_ptr->pseikaku == PERSONALITY_CHARGEMAN) {
             if (randint0(2) == 0)
                 msg_print(_("ジュラル星人め!", ""));
             else
index b152a3c..5168495 100644 (file)
@@ -122,7 +122,7 @@ void spell_RF4_DISPEL(MONSTER_IDX m_idx, player_type *target_ptr, MONSTER_IDX t_
 
         if (is_echizen(target_ptr))
             msg_print(_("やりやがったな!", ""));
-        else if ((target_ptr->pseikaku == PERSONALITY_CHARGEMAN)) {
+        else if (target_ptr->pseikaku == PERSONALITY_CHARGEMAN) {
             if (randint0(2) == 0)
                 msg_print(_("ジュラル星人め!", ""));
             else
index 6f67228..aa344e9 100644 (file)
@@ -215,7 +215,7 @@ void spell_RF6_TELE_AWAY(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER_IDX
     if (TARGET_TYPE == MONSTER_TO_PLAYER) {
         if (is_echizen(target_ptr))
             msg_print(_("くっそ~", ""));
-        else if ((target_ptr->pseikaku == PERSONALITY_CHARGEMAN)) {
+        else if (target_ptr->pseikaku == PERSONALITY_CHARGEMAN) {
             if (randint0(2) == 0)
                 msg_print(_("ジュラル星人め!", ""));
             else
index 1b26f6d..63bef2f 100644 (file)
@@ -36,7 +36,7 @@ bool item_tester_okay(player_type *player_ptr, object_type *o_ptr, tval_type tva
             return FALSE;
     }
 
-    if ((item_tester_hook == NULL))
+    if (item_tester_hook == NULL)
         return TRUE;
 
     return (*item_tester_hook)(player_ptr, o_ptr);