Use the maximum bow range constant in monster_ai instead of just the …

…number 10.
miki151 · Mar 12, 2018 · e47039f · e47039f
1 parent e546886
commit e47039f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/monster_ai.cpp b/monster_ai.cpp
@@ -37,6 +37,7 @@
 #include "furniture.h"
 #include "furniture_factory.h"
 #include "file_path.h"
+#include "ranged_weapon.h"
 
 class Behaviour {
   public:
@@ -581,7 +582,7 @@ class Fighter : public Behaviour {
       if (auto move = considerBuffs())
         return move;
     if (distance > 1) {
-      if (distance < 10) {
+      if (distance <= MAX_RANGED_DISTANCE) {
         if (MoveInfo move = getFireMove(enemyDir, other))
           return move;
         if (MoveInfo move = getThrowMove(enemyDir, other))

diff --git a/ranged_weapon.cpp b/ranged_weapon.cpp
@@ -30,7 +30,6 @@
 #include "view_id.h"
 #include "event_listener.h"
 #include "vision.h"
-#define MAX_RANGED_DISTANCE 10
 
 SERIALIZE_DEF(RangedWeapon, damageAttr, projectileName, projectileViewId)
 SERIALIZATION_CONSTRUCTOR_IMPL(RangedWeapon)

diff --git a/ranged_weapon.h b/ranged_weapon.h
@@ -17,6 +17,7 @@
 
 #include "util.h"
 #include "item.h"
+#define MAX_RANGED_DISTANCE 10
 
 class RangedWeapon {
   public: