- SC_ORCISH will now be dispelled on logout (if debufF_on_logout is set)

- Removed attackrange/attackrange_ from TBL_PC, corrected clif.c using the incorrect range variable.
- You can now equip/unequip stuff while the storage is open.


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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 57fd3d5b3..7c82b1159 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6237,7 +6237,7 @@ int clif_movetoattack(struct map_session_data *sd,struct block_list *bl)
 	WFIFOW(fd, 8)=bl->y;

 	WFIFOW(fd,10)=sd->bl.x;

 	WFIFOW(fd,12)=sd->bl.y;

-	WFIFOW(fd,14)=sd->attackrange;

+	WFIFOW(fd,14)=sd->battle_status.rhw.range;

 	WFIFOSET(fd,packet_len_table[0x139]);

 	return 0;

 }

@@ -9247,7 +9247,9 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
 	if(sd->npc_id) {

 		if (sd->npc_id != sd->npc_item_flag)

 			return;

-	} else if (clif_cant_act(sd))

+	} else if (sd->state.storage_flag)

+		; //You can equip/unequip stuff while storage is open.

+	else if (clif_cant_act(sd))

 		return;

 		

 	if(sd->sc.data[SC_BLADESTOP].timer!=-1 || sd->sc.data[SC_BERSERK].timer!=-1 )

@@ -9284,6 +9286,11 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
 		return;

 	}

 

+	if (sd->state.storage_flag)

+		; //You can equip/unequip stuff while storage is open.

+	else if (clif_cant_act(sd))

+		return;

+

 	if (clif_cant_act(sd))

 		return;