summaryrefslogtreecommitdiff
path: root/src/actormanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 20:33:10 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 20:33:10 +0300
commit9f1994182d4225f630a93ae06b01927c4f7a9a37 (patch)
treeb3557f6c6e6a923170929fd6553b59f872634291 /src/actormanager.h
parentaef032f93b7bdc6e5908b2fa5f940a43bcfce50e (diff)
downloadplus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.gz
plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.bz2
plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.xz
plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.zip
Convert ActorType enum into strong typed enum.
Diffstat (limited to 'src/actormanager.h')
-rw-r--r--src/actormanager.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/actormanager.h b/src/actormanager.h
index 3dbf24d34..483a2d2c9 100644
--- a/src/actormanager.h
+++ b/src/actormanager.h
@@ -71,7 +71,7 @@ class ActorManager final: public ConfigListener
* Create a Being and add it to the list of ActorSprites.
*/
Being *createBeing(const BeingId id,
- const ActorType::Type type,
+ const ActorTypeT type,
const BeingTypeId subtype) A_WARN_UNUSED;
static Being *cloneBeing(const Being *const srcBeing,
@@ -106,7 +106,7 @@ class ActorManager final: public ConfigListener
/**
* Returns a being at specific coordinates.
*/
- Being *findBeing(const int x, const int y, const ActorType::Type
+ Being *findBeing(const int x, const int y, const ActorTypeT
type = ActorType::Unknown) const A_WARN_UNUSED;
/**
@@ -149,7 +149,7 @@ class ActorManager final: public ConfigListener
*/
Being *findNearestLivingBeing(const int x, const int y,
int maxTileDist,
- const ActorType::Type type,
+ const ActorTypeT type,
const Being *const excluded)
const A_WARN_UNUSED;
@@ -163,7 +163,7 @@ class ActorManager final: public ConfigListener
*/
Being *findNearestLivingBeing(const Being *const aroundBeing,
const int maxTileDist,
- const ActorType::Type type,
+ const ActorTypeT type,
const AllowSort allowSort)
const A_WARN_UNUSED;
@@ -171,7 +171,7 @@ class ActorManager final: public ConfigListener
* Finds a being by name and (optionally) by type.
*/
Being *findBeingByName(const std::string &name,
- const ActorType::Type
+ const ActorTypeT
type = ActorType::Unknown)
const A_WARN_UNUSED;
@@ -179,7 +179,7 @@ class ActorManager final: public ConfigListener
* Finds a nearest being by name and (optionally) by type.
*/
Being *findNearestByName(const std::string &name,
- const ActorType::Type &type
+ const ActorTypeT &type
= ActorType::Unknown) const A_WARN_UNUSED;
/**
@@ -194,7 +194,7 @@ class ActorManager final: public ConfigListener
* no being is returned
*/
// void HealAllTargets(Being *aroundBeing, int maxdist,
-// ActorType::Type type) const;
+// ActorTypeT type) const;
void healTarget() const;
@@ -338,13 +338,13 @@ class ActorManager final: public ConfigListener
protected:
bool validateBeing(const Being *const aroundBeing,
Being *const being,
- const ActorType::Type &type,
+ const ActorTypeT &type,
const Being *const excluded = nullptr,
const int maxCost = 20) const A_WARN_UNUSED;
Being *findNearestLivingBeing(const Being *const aroundBeing,
const int maxdist,
- const ActorType::Type &type,
+ const ActorTypeT &type,
const int x, const int y,
const Being *const excluded,
const AllowSort allowSort)