summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-04 23:12:58 +0300
committerAndrei Karas <akaras@inbox.ru>2016-10-04 23:12:58 +0300
commite7dcc170e6a4ceea56035a587af6de62330efb09 (patch)
tree23bfbee374c7ccbe7a85a42e60a1152c6b0ed612 /src/net
parenta6c31640303618601c8520c13f1565e8ed816447 (diff)
downloadmv-e7dcc170e6a4ceea56035a587af6de62330efb09.tar.gz
mv-e7dcc170e6a4ceea56035a587af6de62330efb09.tar.bz2
mv-e7dcc170e6a4ceea56035a587af6de62330efb09.tar.xz
mv-e7dcc170e6a4ceea56035a587af6de62330efb09.zip
Move beingtype into enums directory.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beingrecv.cpp18
-rw-r--r--src/net/eathena/beingrecv.h4
-rw-r--r--src/net/eathena/beingtype.h45
3 files changed, 11 insertions, 56 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index cc744e18d..9f8736a03 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -296,11 +296,11 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
return;
// need set type based on id
- BeingType::BeingType type = BeingType::MONSTER;
+ BeingTypeT type = BeingType::MONSTER;
if (msg.getVersion() >= 20091103)
{
msg.readInt16("len");
- type = static_cast<BeingType::BeingType>(
+ type = static_cast<BeingTypeT>(
msg.readUInt8("object type"));
}
@@ -516,10 +516,10 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
if (msg.getVersion() >= 20091103)
msg.readInt16("len");
- BeingType::BeingType type;
+ BeingTypeT type;
if (msg.getVersion() >= 20071106)
{
- type = static_cast<BeingType::BeingType>(
+ type = static_cast<BeingTypeT>(
msg.readUInt8("object type"));
}
else
@@ -741,11 +741,11 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
return;
// need get type from id
- BeingType::BeingType type = BeingType::MONSTER;
+ BeingTypeT type = BeingType::MONSTER;
if (msg.getVersion() >= 20091103)
{
msg.readInt16("len");
- type = static_cast<BeingType::BeingType>(
+ type = static_cast<BeingTypeT>(
msg.readUInt8("object type"));
}
@@ -1611,7 +1611,7 @@ void BeingRecv::processBeingFakeName(Net::MessageIn &msg)
msg.skip(3, "unused");
return;
}
- const BeingType::BeingType type = static_cast<BeingType::BeingType>(
+ const BeingTypeT type = static_cast<BeingTypeT>(
msg.readUInt8("object type"));
const BeingId id = msg.readBeingId("npc id");
msg.skip(8, "unused");
@@ -1953,7 +1953,7 @@ void BeingRecv::processNameResponse2(Net::MessageIn &msg)
Being *BeingRecv::createBeing2(Net::MessageIn &msg,
const BeingId id,
const int32_t job,
- const BeingType::BeingType beingType)
+ const BeingTypeT beingType)
{
if (!actorManager)
return nullptr;
@@ -1992,7 +1992,7 @@ Being *BeingRecv::createBeing2(Net::MessageIn &msg,
break;
case BeingType::CHAT:
default:
- UNIMPLIMENTEDPACKETFIELD(beingType);
+ UNIMPLIMENTEDPACKETFIELD(CAST_S32(beingType));
type = ActorType::Monster;
logger->log("not supported object type: %d, job: %d",
CAST_S32(beingType), CAST_S32(job));
diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h
index b1802ffa0..e5e9b2b25 100644
--- a/src/net/eathena/beingrecv.h
+++ b/src/net/eathena/beingrecv.h
@@ -23,7 +23,7 @@
#ifndef NET_EATHENA_BEINGRECV_H
#define NET_EATHENA_BEINGRECV_H
-#include "net/eathena/beingtype.h"
+#include "enums/net/beingtype.h"
#include "enums/resources/skill/skilltype2.h"
@@ -116,7 +116,7 @@ namespace EAthena
Being *createBeing2(Net::MessageIn &msg,
const BeingId id,
const int32_t job,
- const BeingType::BeingType beingType);
+ const BeingTypeT beingType);
void applyPlayerAction(Net::MessageIn &msg,
Being *const being,
const uint8_t type);
diff --git a/src/net/eathena/beingtype.h b/src/net/eathena/beingtype.h
deleted file mode 100644
index d02f6f57c..000000000
--- a/src/net/eathena/beingtype.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2014-2016 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NET_EATHENA_BEINGTYPE_H
-#define NET_EATHENA_BEINGTYPE_H
-
-namespace EAthena
-{
- namespace BeingType
- {
- enum BeingType
- {
- PC = 0,
- NPC = 1,
- ITEM = 2,
- SKILL = 3,
- CHAT = 4,
- MONSTER = 5,
- NPC_EVENT = 6,
- PET = 7,
- HOMUN = 8,
- MERSOL = 9,
- ELEMENTAL = 10
- };
- } // namespace BeingType
-} // namespace EAthena
-
-#endif // NET_EATHENA_BEINGTYPE_H