X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.h;h=d1746c71a3cd73ff77dc37fb03de899796bdcf6f;hb=a67f7e662c85b2b8d46f26a3c6e018b2df6eb318;hp=8832fca31aab4d8253120732cc84d0aedafc4276;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git diff --git a/src/map/Entity.h b/src/map/Entity.h index 8832fca..d1746c7 100644 --- a/src/map/Entity.h +++ b/src/map/Entity.h @@ -1,10 +1,3 @@ -/* - * Entity.h - * - * Created on: Sep 29, 2012 - * Author: holy - */ - #ifndef MAP_ENTITY_H_ #define MAP_ENTITY_H_ @@ -117,9 +110,9 @@ public: /// Add monsters. This will cause the entity to be Hostile() and result in a /// battle scene with given monsters when touched. - void SetMonsters(battle::Monster *m, int num) { monsters = m; numMonsters = num; } - battle::Monster *MonstersBegin() { return monsters; } - battle::Monster *MonstersEnd() { return monsters + numMonsters; } + void SetMonsters(battle::Monster **m, int num) { monsters = m; numMonsters = num; } + battle::Monster **MonstersBegin() { return monsters; } + battle::Monster **MonstersEnd() { return monsters + numMonsters; } /// Get an entity that should follow in this one's steps or 0 if none. Entity *Follower() { return follower; } @@ -150,7 +143,7 @@ private: const graphics::Animation *animation; const graphics::Sprite *sprite; battle::PartyLayout *partyLayout; - battle::Monster *monsters; + battle::Monster **monsters; int numMonsters; graphics::AnimationRunner runner; geometry::Vector spriteOffset;