* Merged changes up to eAthena 15058.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15476 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/packet_db.txt

@@ -24,7 +24,7 @@
 // them for the current and all higher versions, unless explicitely disabled.
 //
 // Outgoing packets must be specified in order to enable them for the current
-// and all higher versions, unless explocitely disabled. Packets that are not
+// and all higher versions, unless explicitely disabled. Packets that are not
 // enabled for a packet version are silently discarded when sent as multicast.
 //
 // Every packet version inherits packet definitions from the previous (lower)
@@ -196,7 +196,7 @@ packet_ver: 5
 0x00ff,10,replypartyinvite,2:6
 0x0100,2,leaveparty,0
 0x0101,6
-0x0102,6,partychangeoption,2:4
+0x0102,6,partychangeoption,2
 0x0103,30,removepartymember,2:6
 0x0104,79
 0x0105,31
@@ -691,10 +691,10 @@ packet_ver: 15
 0x022c,64
 
 //2005-04-25aSakexe
-0x022d,5,hommenu,4
-0x0232,9,hommoveto,6
-0x0233,11,homattack,0
-0x0234,6,hommovetomaster,0
+0x022d,5,hommenu,2:4
+0x0232,9,hommoveto,2:6
+0x0233,11,homattack,2:6:10
+0x0234,6,hommovetomaster,2
 
 //2005-05-09aSakexe
 packet_ver: 16
@@ -1387,7 +1387,7 @@ packet_ver: 25
 //0x0447,2
 
 //2009-06-03aRagexeRE
-0x07d7,8,partychangeoption,2:6
+0x07d7,8,partychangeoption,2:6:7
 0x07d8,8
 0x07d9,254
 0x07da,6,partychangeleader,2
@@ -1473,7 +1473,7 @@ packet_ver: 25
 //0x07ff,-1
 
 //2009-12-15aRagexeRE
-//0x0800,-1
+0x0800,-1
 //0x0801,-1
 
 //2009-12-22aRagexeRE

src/map/clif.h

@@ -176,6 +176,7 @@ typedef enum clr_type
 	CLR_DEAD,
 	CLR_RESPAWN,
 	CLR_TELEPORT,
+	CLR_TRICKDEAD,
 } clr_type;
 
 enum map_property
@@ -613,7 +614,7 @@ void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag);
 int clif_homskillinfoblock(struct map_session_data *sd);
 void clif_homskillup(struct map_session_data *sd, int skill_num);	//[orn]
 int clif_hom_food(struct map_session_data *sd,int foodid,int fail);	//[orn]
-void clif_send_homdata(struct map_session_data *sd, int type, int param);	//[orn]
+void clif_send_homdata(struct map_session_data *sd, int state, int param);	//[orn]
 
 void clif_equiptickack(struct map_session_data* sd, int flag);
 void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* tsd);

src/map/homunculus.h

@@ -24,10 +24,11 @@ struct s_homunculus_db {
 
 extern struct s_homunculus_db homuncumlus_db[MAX_HOMUNCULUS_CLASS];
 enum { HOMUNCULUS_CLASS, HOMUNCULUS_FOOD };
+
 enum {
-	SP_ACK 	= 0x00,
-	SP_INTIMATE 	= 0x100,
-	SP_HUNGRY 		= 0x200
+	SP_ACK      = 0x0,
+	SP_INTIMATE = 0x1,
+	SP_HUNGRY   = 0x2,
 };
 
 struct homun_data {

src/map/pc.c

@@ -5238,9 +5238,9 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int
 
 #if PACKETVER >= 20091027
 	if(base_exp)
-		clif_displayexp(sd, base_exp, 1, quest);
+		clif_displayexp(sd, base_exp, SP_BASEEXP, quest);
 	if(job_exp)
-		clif_displayexp(sd, job_exp,  2, quest);
+		clif_displayexp(sd, job_exp,  SP_JOBEXP, quest);
 #endif
 	if(sd->state.showexp) {
 		char output[256];

src/map/skill.c

@@ -1533,7 +1533,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 			TBL_HOM *hd = (TBL_HOM*)src;
 			hd->homunculus.intimacy = 200;
 			if (hd->master)
-				clif_send_homdata(hd->master,0x100,hd->homunculus.intimacy/100);
+				clif_send_homdata(hd->master,SP_INTIMATE,hd->homunculus.intimacy/100);
 		}
 		break;
 	case CR_GRANDCROSS: