Introduced Point class to replace the confusing and clumsy usage of std::pair.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/gamehandler.cpp b/src/gamehandler.cpp
index 6305f410..eeb49478 100644
--- a/src/gamehandler.cpp
+++ b/src/gamehandler.cpp
@@ -231,7 +231,7 @@ void GameHandler::sayAround(GameClient &computer, std::string const &text)
     msg.writeString(text);
 
     unsigned speakerMapId = beingPtr->getMapId();
-    std::pair<unsigned, unsigned> speakerXY = beingPtr->getXY();
+    Point speakerPosition = beingPtr->getXY();
 
     for (NetComputers::iterator i = clients.begin(), i_end = clients.end();
          i != i_end; ++i)
@@ -244,10 +244,7 @@ void GameHandler::sayAround(GameClient &computer, std::string const &text)
             continue;
         }
 
-        std::pair<unsigned, unsigned> listenerXY = listener->getXY();
-
-        if (areAround(listenerXY.first, listenerXY.second,
-                      speakerXY.first, speakerXY.second))
+        if (speakerPosition.inRangeOf(listener->getXY()))
         {
             (*i)->send(msg);
         }