diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-17 19:51:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-17 19:51:59 +0300 |
| commit | 58c319a56a70588b59868099c659f70209a60be1 (patch) | |
| tree | 8f964df390f54834bf3a6b4b9d2eeeec66d1b3f8 /src/net | |
| parent | 2bd61993e4b8cb190fbbbcf620f4901636404d48 (diff) | |
| download | manaverse-58c319a56a70588b59868099c659f70209a60be1.tar.gz manaverse-58c319a56a70588b59868099c659f70209a60be1.tar.bz2 manaverse-58c319a56a70588b59868099c659f70209a60be1.tar.xz manaverse-58c319a56a70588b59868099c659f70209a60be1.zip | |
Remove default parameters from localplayer.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/playerrecv.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/beingrecv.cpp | 4 | ||||
| -rw-r--r-- | src/net/tmwa/beingrecv.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp index 2f0e5782f..493e80a5e 100644 --- a/src/net/ea/playerrecv.cpp +++ b/src/net/ea/playerrecv.cpp @@ -73,7 +73,7 @@ void PlayerRecv::processPlayerWarp(Net::MessageIn &msg) * to changeMap, as it deletes all beings. */ if (localPlayer != nullptr) - localPlayer->stopAttack(); + localPlayer->stopAttack(false); Game *const game = Game::instance(); if (game == nullptr) diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index ff67669d4..30c6a932e 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -1598,7 +1598,7 @@ void BeingRecv::processBeingResurrect(Net::MessageIn &msg) // If this is player's current target, clear it. if (dstBeing == localPlayer->getTarget()) - localPlayer->stopAttack(); + localPlayer->stopAttack(false); if (dstBeing == localPlayer && deathNotice != nullptr) { @@ -1844,7 +1844,7 @@ void BeingRecv::processBeingSlide(Net::MessageIn &msg) return; if (localPlayer == dstBeing) { - localPlayer->stopAttack(); + localPlayer->stopAttack(false); localPlayer->navigateClean(); if (viewport != nullptr) viewport->returnCamera(); diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index b4e1df298..874c5069f 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -363,7 +363,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg) } dstBeing->setHairColor(hairColor); } - localPlayer->imitateOutfit(dstBeing); + localPlayer->imitateOutfit(dstBeing, -1); uint16_t x, y; msg.readCoordinates(x, y, dir, "position"); @@ -507,7 +507,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg) } dstBeing->setHairColor(hairColor); } - localPlayer->imitateOutfit(dstBeing); + localPlayer->imitateOutfit(dstBeing, -1); uint16_t x, y; msg.readCoordinates(x, y, dir, "position"); @@ -651,7 +651,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg) } dstBeing->setHairColor(hairColor); } - localPlayer->imitateOutfit(dstBeing); + localPlayer->imitateOutfit(dstBeing, -1); uint16_t srcX, srcY, dstX, dstY; msg.readCoordinatePair(srcX, srcY, dstX, dstY, "moving path"); @@ -1298,7 +1298,7 @@ void BeingRecv::processBeingResurrect(Net::MessageIn &msg) // If this is player's current target, clear it. if (dstBeing == localPlayer->getTarget()) - localPlayer->stopAttack(); + localPlayer->stopAttack(false); if (dstBeing == localPlayer && deathNotice != nullptr) { |