summaryrefslogtreecommitdiff
path: root/src/emap
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-11-29 20:12:02 +0300
committerAndrei Karas <akaras@inbox.ru>2017-11-29 20:12:02 +0300
commit9712d4c8820c14d43d5869163722ccda7595a5df (patch)
tree77e38a0c29295dd91e71d8033b9fcfe002361663 /src/emap
parent51e1c8fd61d0e8270c7502095c73cf58f8beac62 (diff)
downloadevol-hercules-9712d4c8820c14d43d5869163722ccda7595a5df.tar.gz
evol-hercules-9712d4c8820c14d43d5869163722ccda7595a5df.tar.bz2
evol-hercules-9712d4c8820c14d43d5869163722ccda7595a5df.tar.xz
evol-hercules-9712d4c8820c14d43d5869163722ccda7595a5df.zip
Update from hercules.s20171226
Diffstat (limited to 'src/emap')
-rw-r--r--src/emap/clif.c12
-rw-r--r--src/emap/skill.c2
-rw-r--r--src/emap/skill.h2
3 files changed, 10 insertions, 6 deletions
diff --git a/src/emap/clif.c b/src/emap/clif.c
index d6f4e11..75807e8 100644
--- a/src/emap/clif.c
+++ b/src/emap/clif.c
@@ -1022,6 +1022,10 @@ void eclif_useskill(struct block_list* bl,
{
clif->send(buf, len, bl, AREA);
}
+#if PACKETVER >= 20151223
+ if ((skill->get_inf2(skill_id) & INF2_SHOW_SKILL_SCALE) != 0)
+ clif->skill_scale(bl, src_id, bl->x, bl->y, skill_id, skill_lv, casttime);
+#endif
}
void eclif_skillinfoblock_pre(struct map_session_data **sdPtr)
@@ -1038,11 +1042,11 @@ void eclif_skillinfoblock_pre(struct map_session_data **sdPtr)
if (!fd)
return;
- WFIFOHEAD(fd, MAX_SKILL * 41 + 4);
+ WFIFOHEAD(fd, MAX_SKILL_DB * 41 + 4);
WFIFOW(fd, 0) = 0x10f;
int len = 4;
int i;
- for (i = 0; i < MAX_SKILL; i++)
+ for (i = 0; i < MAX_SKILL_DB; i++)
{
int id = sd->status.skill[i].id;
if (id != 0)
@@ -1078,7 +1082,7 @@ void eclif_skillinfoblock_pre(struct map_session_data **sdPtr)
WFIFOSET(fd, len);
// workaround for bugreport:5348; send the remaining skills one by one to bypass packet size limit
- for ( ; i < MAX_SKILL; i++)
+ for ( ; i < MAX_SKILL_DB; i++)
{
int id = sd->status.skill[i].id;
if (id != 0)
@@ -1163,7 +1167,7 @@ void eclif_skillinfo_pre(struct map_session_data **sdPtr,
int skill_id = *skill_idPtr;
int idx = skill->get_index(skill_id);
- Assert_retv(idx >= 0 && idx < MAX_SKILL);
+ Assert_retv(idx >= 0 && idx < MAX_SKILL_DB);
int inf = *infPtr;
const int fd = sd->fd;
diff --git a/src/emap/skill.c b/src/emap/skill.c
index d559693..4cb8ce7 100644
--- a/src/emap/skill.c
+++ b/src/emap/skill.c
@@ -31,7 +31,7 @@
#include "plugins/HPMHooking.h"
int eskill_get_index_post(int retVal,
- uint16 skill_id)
+ int skill_id)
{
if (skill_id >= EVOL_FIRST_SKILL && skill_id < EVOL_FIRST_SKILL + MAX_EVOL_SKILLS)
{
diff --git a/src/emap/skill.h b/src/emap/skill.h
index c016798..98f5d68 100644
--- a/src/emap/skill.h
+++ b/src/emap/skill.h
@@ -5,7 +5,7 @@
#define EVOL_MAP_SKILL
int eskill_get_index_post(int retVal,
- uint16 skill_id);
+ int skill_id);
int eskill_check_condition_castend_post(int retVal,
TBL_PC* sd,