OSDN Git Service

[Fix] #280 player-status-flags.c 内で論理和計算すべきところを即値代入しているミスを修正. / Corrected a mistake...
authordeskull <deskull@users.sourceforge.jp>
Wed, 24 Feb 2021 03:24:17 +0000 (12:24 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Wed, 24 Feb 2021 03:45:59 +0000 (12:45 +0900)
src/player/player-status-flags.c

index ee23671..0d61858 100644 (file)
@@ -603,7 +603,6 @@ BIT_FLAGS has_sustain_wis(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
 
-    result = FALSE;
     if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 19)
         result |= 0x01U << FLAG_CAUSE_CLASS;
 
@@ -688,21 +687,22 @@ BIT_FLAGS has_levitation(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
 
-    if (creature_ptr->muta3 & MUT3_WINGS)
-        result = FLAG_CAUSE_MUTATION;
+    if (creature_ptr->muta3 & MUT3_WINGS) {
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
+    }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) || is_specific_player_race(creature_ptr, RACE_SPECTRE)
         || is_specific_player_race(creature_ptr, RACE_SPRITE) || is_specific_player_race(creature_ptr, RACE_ARCHON)
         || is_specific_player_race(creature_ptr, RACE_S_FAIRY)) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KAMAE_SUZAKU || (creature_ptr->special_defense & KATA_MUSOU)) {
-        result = FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || creature_ptr->magicdef) {
@@ -739,12 +739,12 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_NINJA) {
-        result = FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (creature_ptr->lev > 14 && !creature_ptr->mimic_form && creature_ptr->prace == RACE_HALF_TROLL) {
         if (creature_ptr->pclass == CLASS_WARRIOR || creature_ptr->pclass == CLASS_BERSERKER) {
-            result = FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
             /* Let's not make Regeneration
              * a disadvantage for the poor warriors who can
              * never learn a spell that satisfies hunger (actually
@@ -754,7 +754,7 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result = FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
@@ -764,7 +764,7 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     if (!creature_ptr->mimic_form
         && (creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_ZOMBIE || creature_ptr->prace == RACE_SPECTRE
             || creature_ptr->prace == RACE_ANDROID)) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SLOW_DIGEST);