summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/battlegroundrecv.cpp2
-rw-r--r--src/net/eathena/beingrecv.cpp7
-rw-r--r--src/net/eathena/beingrecv.h2
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/playerhandler.cpp2
-rw-r--r--src/net/eathena/playerrecv.cpp2
-rw-r--r--src/net/hostsgroup.h4
-rw-r--r--src/net/tmwa/playerhandler.cpp2
8 files changed, 13 insertions, 12 deletions
diff --git a/src/net/eathena/battlegroundrecv.cpp b/src/net/eathena/battlegroundrecv.cpp
index dc01547b2..ecbeb5ef2 100644
--- a/src/net/eathena/battlegroundrecv.cpp
+++ b/src/net/eathena/battlegroundrecv.cpp
@@ -49,7 +49,7 @@ void BattleGroundRecv::processBattleEmblem2(Net::MessageIn &msg)
Being *const dstBeing = actorManager->findBeing(id);
if (dstBeing)
- dstBeing->setTeamId(teamId);
+ dstBeing->setTeamId(CAST_U16(teamId));
}
void BattleGroundRecv::processBattleUpdateScore(Net::MessageIn &msg)
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 58197bf03..3da2567f8 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1272,7 +1272,10 @@ void BeingRecv::processSkillEntry(Net::MessageIn &msg)
int level = 0;
if (msg.getVersion() >= 20130731)
level = msg.readUInt8("level");
- Being *const dstBeing = createBeing2(msg, id, job, BeingType::SKILL);
+ Being *const dstBeing = createBeing2(msg,
+ id,
+ job,
+ BeingType::SKILL);
if (!dstBeing)
return;
dstBeing->setAction(BeingAction::STAND, 0);
@@ -1761,7 +1764,7 @@ void BeingRecv::processNameResponse2(Net::MessageIn &msg)
Being *BeingRecv::createBeing2(Net::MessageIn &msg,
const BeingId id,
- const int16_t job,
+ const int32_t job,
const BeingType::BeingType beingType)
{
if (!actorManager)
diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h
index ea3e0bc2e..f84895a7d 100644
--- a/src/net/eathena/beingrecv.h
+++ b/src/net/eathena/beingrecv.h
@@ -114,7 +114,7 @@ namespace EAthena
void processSkillDamage(Net::MessageIn &msg);
Being *createBeing2(Net::MessageIn &msg,
const BeingId id,
- const int16_t job,
+ const int32_t job,
const BeingType::BeingType beingType);
void applyPlayerAction(Net::MessageIn &msg,
Being *const being,
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 201cf038f..7d3b36f72 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -221,7 +221,7 @@ void InventoryHandler::selectCart(const BeingId accountId,
{
createOutPacket(CMSG_SELECT_CART);
outMsg.writeBeingId(accountId, "account id");
- outMsg.writeInt8(type, "type");
+ outMsg.writeInt8(CAST_S8(type), "type");
}
void InventoryHandler::identifyItem(const Item *const item) const
@@ -239,7 +239,7 @@ void InventoryHandler::mergeItemsAck(const std::vector<Item*> &items) const
"len");
FOR_EACH (std::vector<Item*>::const_iterator, it, items)
{
- outMsg.writeInt16((*it)->getInvIndex() + 2,
+ outMsg.writeInt16(CAST_S16((*it)->getInvIndex() + 2),
"item index");
}
}
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 429ea1f21..09c80e5fa 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -84,7 +84,7 @@ void PlayerHandler::increaseAttribute(const AttributesT attr,
{
createOutPacket(CMSG_STAT_UPDATE_REQUEST);
outMsg.writeInt16(CAST_S16(attr), "attribute id");
- outMsg.writeInt8(amount, "increase");
+ outMsg.writeInt8(CAST_S8(amount), "increase");
}
}
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 9db414edb..f7a6e637d 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -37,8 +37,6 @@
#include "gui/windows/statuswindow.h"
#include "gui/windows/whoisonline.h"
-#include "input/inputmanager.h"
-
#include "net/messagein.h"
#include "net/eathena/sp.h"
diff --git a/src/net/hostsgroup.h b/src/net/hostsgroup.h
index ec217630f..abd98a421 100644
--- a/src/net/hostsgroup.h
+++ b/src/net/hostsgroup.h
@@ -27,7 +27,9 @@
struct HostsGroup final
{
- HostsGroup()
+ HostsGroup() :
+ name(),
+ hosts()
{
}
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 4ec61960f..eb9665af9 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -36,8 +36,6 @@
#include "gui/windows/skilldialog.h"
#include "gui/windows/statuswindow.h"
-#include "net/ea/eaprotocol.h"
-
#include "net/tmwa/inventoryhandler.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocolout.h"