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/resources/npcdb.h | |
| parent | 51945aa1af6f2a6dc15027ef40cf0ccf424d46e1 (diff) | |
| download | mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.gz mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.bz2 mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.xz mana-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/resources/npcdb.h')
| -rw-r--r-- | src/resources/npcdb.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index 84ae4e24..b0c89c80 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -22,11 +22,7 @@ #ifndef NPC_DB_H #define NPC_DB_H -#include "resources/spritedef.h" - -#include <map> - -typedef std::map<int, SpriteDisplay*> NPCInfos; +class BeingInfo; /** * NPC information database. @@ -37,9 +33,7 @@ namespace NPCDB void unload(); - const SpriteDisplay& get(int id); - - typedef NPCInfos::iterator NPCInfosIterator; + BeingInfo *get(int id); } #endif |