summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-16 02:31:58 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-16 02:31:58 +0300
commit846e02907e43cdae952c2b78fa11f8343c35068a (patch)
treed9e182c26678973e3337865a8679cbf9896c128d
parent19b82b4dad9b66418a4e7d0ed0ba23d0cab17216 (diff)
downloadplus-846e02907e43cdae952c2b78fa11f8343c35068a.tar.gz
plus-846e02907e43cdae952c2b78fa11f8343c35068a.tar.bz2
plus-846e02907e43cdae952c2b78fa11f8343c35068a.tar.xz
plus-846e02907e43cdae952c2b78fa11f8343c35068a.zip
Remove default parameters from Being::takeDamage.
-rw-r--r--src/being/being.h4
-rw-r--r--src/net/ea/beingrecv.cpp2
-rw-r--r--src/net/eathena/beingrecv.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/being/being.h b/src/being/being.h
index 64a193c46..adbdf7432 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -199,8 +199,8 @@ class Being notfinal : public ActorSprite,
void takeDamage(Being *restrict const attacker,
const int amount,
const AttackTypeT type,
- const int attackId = 1,
- const int level = 1) restrict2;
+ const int attackId,
+ const int level) restrict2;
/**
* Handles an attack of another being by this being.
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index b2859d76f..b802e268f 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -189,7 +189,7 @@ void BeingRecv::processBeingAction(Net::MessageIn &msg)
{
// level not present, using 1
dstBeing->takeDamage(srcBeing, param1,
- static_cast<AttackTypeT>(type), 1);
+ static_cast<AttackTypeT>(type), 1, 1);
}
break;
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index b1daece88..2e3080989 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1228,7 +1228,7 @@ void BeingRecv::processBeingAction2(Net::MessageIn &msg)
{
// level not present, using 1
dstBeing->takeDamage(srcBeing, param1,
- static_cast<AttackTypeT>(type), 1);
+ static_cast<AttackTypeT>(type), 1, 1);
}
break;