From 7dfe062b9e33d863d23455453aae12ba592aac8b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 6 Oct 2013 16:37:19 +0300 Subject: remove unused includes and remove default parameter in being. --- src/net/ea/beinghandler.cpp | 20 ++++++++++---------- src/net/ea/playerhandler.cpp | 4 ++-- src/net/ea/tradehandler.cpp | 1 - src/net/eathena/beinghandler.cpp | 12 ++++++------ src/net/tmwa/beinghandler.cpp | 6 +++--- 5 files changed, 21 insertions(+), 22 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 3392905f5..4e08f5466 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -179,13 +179,13 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, if (spawnId) { - dstBeing->setAction(Being::SPAWN); + dstBeing->setAction(Being::SPAWN, 0); } else if (visible) { dstBeing->clearPath(); dstBeing->setActionTime(tick_time); - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); } // Prevent division by 0 when calculating frame @@ -298,7 +298,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, msg.readCoordinatePair(srcX, srcY, dstX, dstY); if (!disguiseId) { - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); dstBeing->setTileCoords(srcX, srcY); if (serverVersion < 10) dstBeing->setDestination(dstX, dstY); @@ -364,7 +364,7 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) const msg.readCoordinatePair(srcX, srcY, dstX, dstY); msg.readInt32(); // Server tick - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); dstBeing->setTileCoords(srcX, srcY); dstBeing->setDestination(dstX, dstY); if (dstBeing->getType() == Being::PLAYER) @@ -405,7 +405,7 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg) const { if (dstBeing->getCurrentAction() != Being::DEAD) { - dstBeing->setAction(Being::DEAD); + dstBeing->setAction(Being::DEAD, 0); dstBeing->recalcSpritesOrder(); } if (dstBeing->getName() == "Jack O" && killStats) @@ -441,7 +441,7 @@ void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const player_node->stopAttack(); if (msg.readInt8() == 1) - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); } @@ -509,12 +509,12 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const break; // tmw server can send here garbage? // if (srcBeing) -// srcBeing->setAction(Being::DEAD); +// srcBeing->setAction(Being::DEAD, 0); case 0x02: // Sit if (srcBeing) { - srcBeing->setAction(Being::SIT); + srcBeing->setAction(Being::SIT, 0); if (srcBeing->getType() == Being::PLAYER) { srcBeing->setMoveTime(); @@ -527,7 +527,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const case 0x03: // Stand up if (srcBeing) { - srcBeing->setAction(Being::STAND); + srcBeing->setAction(Being::STAND, 0); if (srcBeing->getType() == Being::PLAYER) { srcBeing->setMoveTime(); @@ -712,7 +712,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg) const const uint16_t y = msg.readInt16(); dstBeing->setTileCoords(x, y); if (dstBeing->getCurrentAction() == Being::MOVE) - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); } } } diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 31359ae37..d3667b78a 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -198,7 +198,7 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg) const } } - player_node->setAction(Being::STAND); + player_node->setAction(Being::STAND, 0); player_node->setTileCoords(x, y); player_node->updatePets(); player_node->navigateClean(); @@ -398,7 +398,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) const deathNotice->addActionListener(&deathListener); if (player_node->getCurrentAction() != Being::DEAD) { - player_node->setAction(Being::DEAD); + player_node->setAction(Being::DEAD, 0); player_node->recalcSpritesOrder(); } } diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index c4654087b..eb0441a19 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -34,7 +34,6 @@ #include "gui/windows/confirmdialog.h" #include "gui/windows/tradewindow.h" -#include "net/inventoryhandler.h" #include "net/net.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 685f19f16..739e2397d 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -569,20 +569,20 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, switch (type) { case 0: - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); player_node->imitateAction(dstBeing, Being::STAND); break; case 1: if (dstBeing->getCurrentAction() != Being::DEAD) { - dstBeing->setAction(Being::DEAD); + dstBeing->setAction(Being::DEAD, 0); dstBeing->recalcSpritesOrder(); } break; case 2: - dstBeing->setAction(Being::SIT); + dstBeing->setAction(Being::SIT, 0); player_node->imitateAction(dstBeing, Being::SIT); break; @@ -685,13 +685,13 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, if (spawnId) { - dstBeing->setAction(Being::SPAWN); + dstBeing->setAction(Being::SPAWN, 0); } else if (visible) { dstBeing->clearPath(); dstBeing->setActionTime(tick_time); - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); } // Prevent division by 0 when calculating frame @@ -771,7 +771,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, { uint16_t srcX, srcY, dstX, dstY; msg.readCoordinatePair(srcX, srcY, dstX, dstY); - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); dstBeing->setTileCoords(srcX, srcY); dstBeing->setDestination(dstX, dstY); } diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index cc72a3148..b127517ea 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -594,20 +594,20 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, switch (type) { case 0: - dstBeing->setAction(Being::STAND); + dstBeing->setAction(Being::STAND, 0); player_node->imitateAction(dstBeing, Being::STAND); break; case 1: if (dstBeing->getCurrentAction() != Being::DEAD) { - dstBeing->setAction(Being::DEAD); + dstBeing->setAction(Being::DEAD, 0); dstBeing->recalcSpritesOrder(); } break; case 2: - dstBeing->setAction(Being::SIT); + dstBeing->setAction(Being::SIT, 0); player_node->imitateAction(dstBeing, Being::SIT); break; -- cgit v1.2.3-60-g2f50