diff --git a/server/gameserver/types.cc b/server/gameserver/types.cc index 03f63e76..9efb33b9 100644 --- a/server/gameserver/types.cc +++ b/server/gameserver/types.cc @@ -5,11 +5,6 @@ #include "human.h" #include "glmhelper.h" -float Position::Distance2D(a8::Vec2 pos) const -{ - return pos.Distance(ToVec2()); -} - float Position::Distance2D2(const Position& pos) const { return pos.ToVec2().Distance(ToVec2()); @@ -25,12 +20,6 @@ a8::Vec2 Position::CalcDir2D(const Position& target_pos) const return a8::Vec2(target_pos.x, target_pos.z) - a8::Vec2(x, z); } -void Position::FromVec2(const a8::Vec2 v) -{ - x = v.x; - y = v.y; -} - void Position::FromVec3(const a8::Vec3 v) { x = v.x; diff --git a/server/gameserver/types.h b/server/gameserver/types.h index 4d3d9a3b..02823c9e 100644 --- a/server/gameserver/types.h +++ b/server/gameserver/types.h @@ -67,14 +67,12 @@ struct Position float GetZ() const { return z; }; int GetLayer() const { return layer; }; - float Distance2D(a8::Vec2 pos) const; float Distance2D2(const Position& pos) const; float DistanceGlmVec3(const glm::vec3& v) const; float ManhattanDistance2D(const Position& target_pos) const; a8::Vec2 CalcDir2D(const Position& target_pos) const; glm::vec3 CalcDir(const Position& target_pos) const; - void FromVec2(const a8::Vec2 v); void FromVec3(const a8::Vec3 v); void FromGlmVec3(const glm::vec3 v);