summaryrefslogtreecommitdiff
path: root/src/game-server/being.cpp
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2009-10-09 17:34:25 +0200
committerBertram <bertram@cegetel.net>2009-10-09 17:34:25 +0200
commit3d035402ebffd2da05421125501d2ef4990d5bd7 (patch)
tree9f7c3e3008c5d280d56d9a77a0c259c757af4749 /src/game-server/being.cpp
parent1102bdc2e5a9e52b621cf58d68d0065faba2b84c (diff)
downloadmanaserv-3d035402ebffd2da05421125501d2ef4990d5bd7.tar.gz
manaserv-3d035402ebffd2da05421125501d2ef4990d5bd7.tar.bz2
manaserv-3d035402ebffd2da05421125501d2ef4990d5bd7.tar.xz
manaserv-3d035402ebffd2da05421125501d2ef4990d5bd7.zip
Mostly synced the client and server code for path finding.
Diffstat (limited to 'src/game-server/being.cpp')
-rw-r--r--src/game-server/being.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 7b934a61..634d566a 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -126,7 +126,7 @@ void Being::setDestination(const Point &dst)
mPath.clear();
}
-std::list<PATH_NODE> Being::findPath()
+Path Being::findPath()
{
mOld = getPosition();
int startX = mOld.x / 32, startY = mOld.y / 32;
@@ -165,7 +165,7 @@ void Being::move()
* class has been used, because that seems to be the most logical
* place extra functionality will be added.
*/
- for (std::list<PATH_NODE>::iterator pathIterator = mPath.begin();
+ for (PathIterator pathIterator = mPath.begin();
pathIterator != mPath.end(); pathIterator++)
{
if (!map->getWalk(pathIterator->x, pathIterator->y, getWalkMask()))
@@ -190,11 +190,11 @@ void Being::move()
return;
}
- PATH_NODE prev(tileSX, tileSY);
+ Position prev(tileSX, tileSY);
Point pos;
do
{
- PATH_NODE next = mPath.front();
+ Position next = mPath.front();
mPath.pop_front();
// 362 / 256 is square root of 2, used for walking diagonally
mActionTime += (prev.x != next.x && prev.y != next.y)