[Refactor] #919 Moved grid_cost() and grid_dist() from grid.cpp/h to grid-type-defini...

[hengbandforosx/hengbandosx.git] / src / system / grid-type-definition.cpp

diff --git a/src/system/grid-type-definition.cpp b/src/system/grid-type-definition.cpp
index ab2efb7..abd5fd5 100644 (file)
--- a/src/system/grid-type-definition.cpp
+++ b/src/system/grid-type-definition.cpp
@@ -1,5 +1,7 @@
 #include "system/grid-type-definition.h"
 #include "grid/feature.h" // @todo 相互依存している. 後で何とかする.
+#include "monster-race/race-flags7.h"
+#include "system/monster-race-definition.h"
 #include "util/bit-flags-calculator.h"
 
 /*!
@@ -88,3 +90,18 @@ bool grid_type::is_rune_explosion()
 {
     return this->is_object() && has_flag(f_info[this->mimic].flags, FF_RUNE_EXPLOSION);
 }
+
+byte grid_type::get_cost(monster_race *r_ptr)
+{
+    return this->costs[get_grid_flow_type(r_ptr)];
+}
+
+byte grid_type::get_distance(monster_race *r_ptr)
+{
+    return this->dists[get_grid_flow_type(r_ptr)];
+}
+
+flow_type grid_type::get_grid_flow_type(monster_race *r_ptr)
+{
+    return any_bits(r_ptr->flags7, RF7_CAN_FLY) ? FLOW_CAN_FLY : FLOW_NORMAL;
+}