summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 17:45:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 17:45:52 +0300
commit2d32dc27210d16102f9200de115f2c3f79a5cb22 (patch)
tree5aa84ebe6c5c1d708b14bee2bf0ce95df714fc1d /src/net/ea
parent7bdb50605562e47f1d6ae134881c09bd42293be5 (diff)
downloadmanaverse-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.gz
manaverse-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.bz2
manaverse-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.xz
manaverse-2d32dc27210d16102f9200de115f2c3f79a5cb22.zip
Use BeingTypeId in Being for subtypeid.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/beinghandler.cpp5
-rw-r--r--src/net/ea/beinghandler.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ab32a3f84..5bfdf5212 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -53,7 +53,7 @@ BeingHandler::BeingHandler(const bool enableSync)
}
Being *BeingHandler::createBeing(const BeingId id,
- const int16_t job)
+ const int job)
{
if (!actorManager)
return nullptr;
@@ -68,7 +68,8 @@ Being *BeingHandler::createBeing(const BeingId id,
else if (job == 45)
type = ActorType::Portal;
- Being *const being = actorManager->createBeing(id, type, job);
+ Being *const being = actorManager->createBeing(
+ id, type, fromInt(job, BeingTypeId));
return being;
}
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 632381fb3..55e4a3ef2 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -37,7 +37,7 @@ class BeingHandler notfinal : public Net::BeingHandler
explicit BeingHandler(const bool enableSync);
static Being *createBeing(const BeingId id,
- const int16_t job) A_WARN_UNUSED;
+ const int job) A_WARN_UNUSED;
static void setSprite(Being *const being, const unsigned int slot,
const int id,