summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkotlex <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-08-20 18:14:40 +0000
committerSkotlex <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-08-20 18:14:40 +0000
commit0828cd6660ce9bc0e0fae7d6f9af01051937b82b (patch)
tree5b6db46f4ec0a8fc09ac43c31bb6d1892ab49870
parentfc52a4371fffa1cad6f7effc448406386a313b4b (diff)
downloadhercules-0828cd6660ce9bc0e0fae7d6f9af01051937b82b.tar.gz
hercules-0828cd6660ce9bc0e0fae7d6f9af01051937b82b.tar.bz2
hercules-0828cd6660ce9bc0e0fae7d6f9af01051937b82b.tar.xz
hercules-0828cd6660ce9bc0e0fae7d6f9af01051937b82b.zip
- Added a few missing updates to the last packet update to properly support player clones and disguising.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14387 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt8
-rw-r--r--src/map/clif.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fd7939520..f0efb1fbf 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,8 +3,12 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2010/08/20
+ * Added a few missing updates to the last packet update to properly support player clones and disguising. [Skotlex]
2010/08/19
* Rev. 14384 Follow up to r14383, changed use of clif_font_area to clif_font, seems Skotlex forgot them. [L0ne_W0lf]
+ * Added support for packets 0x7fa, 0x7f7, 0x7f8, 0x7f9. These are for renewal
+ clients and fixes deletion of ammo/displaying of Homunculus HP/SP bars on recent RE clients. [Skotlex]
2010/08/18
* Rev. 14381 Added bonus3 bAdd/SubEle, which allows you to specify a battle flag as well! Dun dun dun! [L0ne_W0lf]
- The bonuses are addititive to existing bAdd/SubEles, as that's how it appears to work.
@@ -13,9 +17,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
* Rev. 14378 Attempting to tackle, and fix some simple errors in skills. [L0ne_W0lf]
- Stormgust hit counter no longer resets under new casts of stormgust.
- RG_STEALCOIN will now cause the monster to aggro player on success. (bugreport:3547)
- - SL_WIZARD will now consume one crystal fragement per reflected hit. (bugreport:3603)
+ - SL_WIZARD will now consume one crystal fragment per reflected hit. (bugreport:3603)
- WZ_FROSTNOVA will now ignore targets in area that are already frozen. (bugreport:3980)
- - SL_KAAHI will no longer uses SP if player has full health already. (bugreport:3918)
+ - SL_KAAHI will no longer use SP if player has full health already. (bugreport:3918)
- CG_TAROTCARD "The Lovers" will heal source player instead of target. (bugreport:4171)
* Merged Shinryo's patch which speeds up map-cache loading (with a few changes, see eA forum thread #253218 for details) [Skotlex]
2010/08/14
diff --git a/src/map/clif.c b/src/map/clif.c
index c0f6ccfaa..1dfdbd899 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -168,7 +168,7 @@ static inline unsigned char clif_bl_type(struct block_list *bl) {
case BL_ITEM: return 0x2; //ITEM_TYPE
case BL_SKILL: return 0x3; //SKILL_TYPE
case BL_CHAT: return 0x4; //UNKNOWN_TYPE
- case BL_MOB: return 0x5; //NPC_MOB_TYPE
+ case BL_MOB: return pcdb_checkid(((TBL_MOB*)bl)->class_)?0x0:0x5; //NPC_MOB_TYPE
case BL_NPC: return 0x6; //NPC_EVT_TYPE
case BL_PET: return 0x7; //NPC_PET_TYPE
case BL_HOM: return 0x8; //NPC_HOM_TYPE
@@ -1016,7 +1016,11 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un
//Used for spawn/walk packets, where the ID offset changes for packetver >=9
static void clif_setdisguise(struct block_list *bl, unsigned char *buf,int len)
{
-#if PACKETVER >= 20071106
+#if PACKETVER >= 20091103
+ WBUFB(buf,4)= 0x5; //NPC_MOB_TYPE
+ WBUFL(buf,5)=-bl->id;
+#elif PACKETVER >= 20071106
+ WBUFB(buf,2)= 0x5; //NPC_MOB_TYPE
WBUFL(buf,3)=-bl->id;
#else
WBUFL(buf,2)=-bl->id;