OSDN Git Service

[Refactor] #40014 Reshaped process_monster_lore()
authorHourier <hourier@users.sourceforge.jp>
Fri, 12 Jun 2020 14:07:21 +0000 (23:07 +0900)
committerHourier <hourier@users.sourceforge.jp>
Fri, 12 Jun 2020 14:07:21 +0000 (23:07 +0900)
src/lore/monster-lore.c

index 1cde370..6ba3aa0 100644 (file)
@@ -219,9 +219,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
     const int max_attack_numbers = 4;
     int count = 0;
     for (int m = 0; m < max_attack_numbers; m++) {
-        if (!lore_ptr->r_ptr->blow[m].method)
-            continue;
-        if (lore_ptr->r_ptr->blow[m].method == RBM_SHOOT)
+        if (!lore_ptr->r_ptr->blow[m].method || (lore_ptr->r_ptr->blow[m].method == RBM_SHOOT))
             continue;
 
         if (lore_ptr->r_ptr->r_blows[m] || lore_ptr->know_everything)
@@ -230,11 +228,8 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
 
     int attack_numbers = 0;
     for (int m = 0; m < max_attack_numbers; m++) {
-        if (!lore_ptr->r_ptr->blow[m].method)
-            continue;
-        if (lore_ptr->r_ptr->blow[m].method == RBM_SHOOT)
-            continue;
-        if (!lore_ptr->r_ptr->r_blows[m] && !lore_ptr->know_everything)
+        if (!lore_ptr->r_ptr->blow[m].method || (lore_ptr->r_ptr->blow[m].method == RBM_SHOOT)
+            || (((lore_ptr->r_ptr->r_blows[m] == 0) && !lore_ptr->know_everything)))
             continue;
 
         rbm_type method = lore_ptr->r_ptr->blow[m].method;