- Fixed npc_checknear's distance check returning the opposite of what it should (false when the range is correct and viceversa)

- SL_STIN/SL_STUN have dex-reducable casting times now.
- Added a warning on item loading when an item is of equippable type but has no equippable position.
- Turning an alliance to an opposition won't work now during WoE
- Slaves can summon other mobs now. The only ones who can't do this are player summoned mobs.
- Merged the following functions for faster processing of items:
  clif_storageitemlist + clif_storageequiplist = clif_storagelist
  clif_guildstorageitemlist + clif_guildstorageequiplist = clif_guildstoragelist
  clif_itemlist + clif_equiplist = clif_inventorylist
- Increased max knockback value support to 25.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7109 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 5 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 16baba08f..a0b5956e8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -385,7 +385,6 @@ int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int lo
 int pc_equippoint(struct map_session_data *sd,int n)

 {

 	int ep = 0;

-	//?生や養子の場合の元の職業を算出する

 

 	nullpo_retr(0, sd);

 

@@ -4029,7 +4028,7 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int
 

 	clif_updatestatus(sd,SP_BASEEXP);

 

-	if (job_exp > 0 && sd->status.job_exp > UINT_MAX - job_exp)

+	if (job_exp && sd->status.job_exp > UINT_MAX - job_exp)

 		sd->status.job_exp = UINT_MAX;

 	else

 		sd->status.job_exp += job_exp;

@@ -5340,7 +5339,6 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper)
 	status_calc_pc(sd,0);

 	pc_checkallowskill(sd);

 	pc_equiplookall(sd);

-	clif_equiplist(sd);

 

 	//if you were previously famous, not anymore.

 	if (fame_flag) {

@@ -5532,8 +5530,7 @@ int pc_setcart(struct map_session_data *sd,int type)
 		option|=cart[type];

 		if(!pc_iscarton(sd)){ // カ?トを付けていない

 			pc_setoption(sd,option);

-			clif_cart_itemlist(sd);

-			clif_cart_equiplist(sd);

+			clif_cartlist(sd);

 			clif_updatestatus(sd,SP_CARTINFO);

 			clif_status_change(&sd->bl,SI_INCREASEAGI,0); //0x0c is 12, Increase Agi??

 		}