Update from hercules.s20171226

6 files changed, 13 insertions, 11 deletions

diff --git a/src/echar/char.h b/src/echar/char.h
index e05bde0..2fe84d1 100644
--- a/src/echar/char.h
+++ b/src/echar/char.h
@@ -17,8 +17,6 @@ void echar_mmo_char_send099d_post(int fd, struct char_session_data *sd);
 
 int echar_mmo_char_send_characters_post(int retVal, int fd, struct char_session_data *sd);
 
-int echar_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf);
-
 void send_additional_slots(int fd, struct char_session_data* sd);
 
 void echar_parse_char_connect_pre(int *fdPtr, struct char_session_data **sd, uint32 *ipl);
diff --git a/src/ecommon/init.c b/src/ecommon/init.c
index c6f4a2e..668fc11 100644
--- a/src/ecommon/init.c
+++ b/src/ecommon/init.c
@@ -44,7 +44,7 @@ void commonClean(void)
 
 void common_online(void)
 {
-    checkVar(MAX_SKILL, 1532);
+    checkVar(MAX_SKILL_DB, 1532);
     checkVar(MAX_SKILL_ID, 20022);
     checkVar(SC_MAX, 658);
     checkVar(SI_MAX, 971);
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,
diff --git a/tools/vars.sh b/tools/vars.sh
index 7be7f49..42655aa 100755
--- a/tools/vars.sh
+++ b/tools/vars.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# MAX_SKILL    1510  + 22 = 1532
+# MAX_SKILL_DB 1510  + 22 = 1532
 # MAX_SKILL_ID 10015 + 22 + 9963 = 20022
 # SC_MAX       653   + 5  = 658
 # SI_MAX       966   + 5  = 971
@@ -10,5 +10,5 @@
 
 # can be used for custom skill id: 10016 - 10036
 
-export VARS=" -DOLD_MAX_SKILL_DB=1510 -DMAX_SKILL=1532 -DMAX_SKILL_ID=20022 -DMAX_EVOL_SKILLS=22 -DEVOL_FIRST_SKILL=20000 -DSC_MAX=658 -DSI_MAX=971"
+export VARS=" -DOLD_MAX_SKILL_DB=1510 -DMAX_SKILL_DB=1532 -DMAX_SKILL_ID=20022 -DMAX_EVOL_SKILLS=22 -DEVOL_FIRST_SKILL=20000 -DSC_MAX=658 -DSI_MAX=971"
 export CPPFLAGS="${VARS}"