diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-29 17:45:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-29 17:45:52 +0300 |
| commit | 2d32dc27210d16102f9200de115f2c3f79a5cb22 (patch) | |
| tree | 5aa84ebe6c5c1d708b14bee2bf0ce95df714fc1d /src/actormanager.h | |
| parent | 7bdb50605562e47f1d6ae134881c09bd42293be5 (diff) | |
| download | manaplus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.gz manaplus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.bz2 manaplus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.xz manaplus-2d32dc27210d16102f9200de115f2c3f79a5cb22.zip | |
Use BeingTypeId in Being for subtypeid.
Diffstat (limited to 'src/actormanager.h')
| -rw-r--r-- | src/actormanager.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/actormanager.h b/src/actormanager.h index 073a5a025..3dbf24d34 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -28,6 +28,7 @@ #include "enums/simpletypes/allowsort.h" #include "enums/simpletypes/allplayers.h" #include "enums/simpletypes/beingid.h" +#include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/npcnames.h" #include "listeners/configlistener.h" @@ -71,7 +72,7 @@ class ActorManager final: public ConfigListener */ Being *createBeing(const BeingId id, const ActorType::Type type, - const uint16_t subtype) A_WARN_UNUSED; + const BeingTypeId subtype) A_WARN_UNUSED; static Being *cloneBeing(const Being *const srcBeing, const int dx, const int dy, @@ -325,8 +326,8 @@ class ActorManager final: public ConfigListener bool checkForPickup(const FloorItem *const item) const A_WARN_UNUSED; - void updateEffects(const std::map<int, int> &addEffects, - const std::set<int> &removeEffects) const; + void updateEffects(const std::map<BeingTypeId, int> &addEffects, + const std::set<BeingTypeId> &removeEffects) const; #ifdef EATHENA_SUPPORT void removeRoom(const int chatId); |