OSDN Git Service

[Refactor] x, y_saver を削除
authorSlimebreath6078 <slimebreath6078@yahoo.co.jp>
Tue, 1 Mar 2022 13:34:46 +0000 (22:34 +0900)
committerSlimebreath6078 <slimebreath6078@yahoo.co.jp>
Tue, 1 Mar 2022 14:05:50 +0000 (23:05 +0900)
名前に反してそれぞれ x1 と y1 しか代入しておらずしかも2か所だけなため該当する変数に置き換えた

src/effect/effect-processor.cpp

index b4aaa9e..0a1748b 100644 (file)
@@ -96,8 +96,6 @@ ProjectResult project(PlayerType *player_ptr, const MONSTER_IDX who, POSITION ra
     POSITION x1;
     POSITION y2;
     POSITION x2;
-    POSITION y_saver;
-    POSITION x_saver;
     bool visual = false;
     bool breath = false;
     bool blind = player_ptr->blind != 0;
@@ -133,9 +131,6 @@ ProjectResult project(PlayerType *player_ptr, const MONSTER_IDX who, POSITION ra
         x1 = target_x;
         y1 = target_y;
     }
-
-    y_saver = y1;
-    x_saver = x1;
     y2 = target_y;
     x2 = target_x;
 
@@ -645,14 +640,14 @@ ProjectResult project(PlayerType *player_ptr, const MONSTER_IDX who, POSITION ra
                     POSITION t_y, t_x;
                     int max_attempts = 10;
                     do {
-                        t_y = y_saver - 1 + randint1(3);
-                        t_x = x_saver - 1 + randint1(3);
+                        t_y = y1 - 1 + randint1(3);
+                        t_x = x1 - 1 + randint1(3);
                         max_attempts--;
                     } while (max_attempts && in_bounds2u(player_ptr->current_floor_ptr, t_y, t_x) && !projectable(player_ptr, y, x, t_y, t_x));
 
                     if (max_attempts < 1) {
-                        t_y = y_saver;
-                        t_x = x_saver;
+                        t_y = y1;
+                        t_x = x1;
                     }
 
                     if (is_seen(player_ptr, m_ptr)) {