summaryrefslogtreecommitdiff
path: root/src/beingmanager.cpp
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-03-09 05:16:27 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-03-09 05:16:27 +0000
commite5f795ad9952b8bba6993ee3e324b22a0f104816 (patch)
tree1602ac0f74865135eae5acf935b0a285a8e918c2 /src/beingmanager.cpp
parent7593d6c71e2331c3e43c732db60ad03ee4d5385d (diff)
downloadMana-e5f795ad9952b8bba6993ee3e324b22a0f104816.tar.gz
Mana-e5f795ad9952b8bba6993ee3e324b22a0f104816.tar.bz2
Mana-e5f795ad9952b8bba6993ee3e324b22a0f104816.tar.xz
Mana-e5f795ad9952b8bba6993ee3e324b22a0f104816.zip
Made all class members named like mClassMember.
Diffstat (limited to 'src/beingmanager.cpp')
-rw-r--r--src/beingmanager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index c5890048..10123d06 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -39,8 +39,9 @@ class FindBeingFunctor
bool operator() (Being *being)
{
Uint16 other_y = y + ((being->getType() == Being::NPC) ? 1 : 0);
- return (being->x == x && (being->y == y || being->y == other_y) &&
- being->action != Being::MONSTER_DEAD &&
+ return (being->mX == x &&
+ (being->mY == y || being->mY == other_y) &&
+ being->mAction != Being::MONSTER_DEAD &&
(type == Being::UNKNOWN || being->getType() == type));
}
@@ -132,7 +133,7 @@ void BeingManager::logic()
being->logic();
- if (being->action == Being::MONSTER_DEAD && being->mFrame >= 20)
+ if (being->mAction == Being::MONSTER_DEAD && being->mFrame >= 20)
{
delete being;
i = mBeings.erase(i);