diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-05-17 19:16:11 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-05-17 21:49:16 -0600 |
| commit | 3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d (patch) | |
| tree | ed0e8cc5b608c31ac79e6d1de03d9ddfc74fa339 /src/beingmanager.h | |
| parent | 51945aa1af6f2a6dc15027ef40cf0ccf424d46e1 (diff) | |
| download | mana-client-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.gz mana-client-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.bz2 mana-client-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.xz mana-client-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.zip | |
Remove Monster, Player, and NPC classes
Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.
Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.
Reviewed-by: Freeyorp
Diffstat (limited to 'src/beingmanager.h')
| -rw-r--r-- | src/beingmanager.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/beingmanager.h b/src/beingmanager.h index d81db668..1d9cc459 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -49,7 +49,7 @@ class BeingManager /** * Create a being and add it to the list of beings. */ - Being *createBeing(int id, Being::Type type, int subtype); + Being *createBeing(int id, ActorSprite::Type type, int subtype); /** * Remove a Being. @@ -64,7 +64,8 @@ class BeingManager /** * Returns a being at specific coordinates. */ - Being *findBeing(int x, int y, Being::Type type = Being::UNKNOWN) const; + Being *findBeing(int x, int y, + ActorSprite::Type type = ActorSprite::UNKNOWN) const; Being *findBeingByPixel(int x, int y) const; /** @@ -77,7 +78,7 @@ class BeingManager * @param type The type of being to look for. */ Being *findNearestLivingBeing(int x, int y, int maxTileDist, - Being::Type type = Being::UNKNOWN) const; + ActorSprite::Type type = Being::UNKNOWN) const; /** * Returns a being nearest to another being. @@ -88,13 +89,13 @@ class BeingManager * @param type The type of being to look for. */ Being *findNearestLivingBeing(Being *aroundBeing, int maxTileDist, - Being::Type type = Being::UNKNOWN) const; + ActorSprite::Type type = Being::UNKNOWN) const; /** * Finds a being by name and (optionally) by type. */ Being *findBeingByName(const std::string &name, - Being::Type type = Being::UNKNOWN) const; + ActorSprite::Type type = Being::UNKNOWN) const; /** * Returns the whole list of beings. |