summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-01-31 16:28:43 -0200
committershennetsind <ind@henn.et>2013-01-31 16:28:43 -0200
commit74ed3ed32f33ad4df945718389d7d74ab0a53794 (patch)
treed3185dabe69e26c5407f34c517c5d39a894ece5a /src/map/clif.c
parent638e2b5c985c13a8138d1cb166d5fdb8148b690c (diff)
downloadhercules-74ed3ed32f33ad4df945718389d7d74ab0a53794.tar.gz
hercules-74ed3ed32f33ad4df945718389d7d74ab0a53794.tar.bz2
hercules-74ed3ed32f33ad4df945718389d7d74ab0a53794.tar.xz
hercules-74ed3ed32f33ad4df945718389d7d74ab0a53794.zip
Fixed Bug #6097
Players in Chatrooms now: - Can Equip/Unequip gear - Can Talk to NPCS - Cant use consumable Items http://hercules.ws/board/tracker/issue-6097-chatroom/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 0e555252b..fba5ffecc 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10141,7 +10141,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
if (pc_isdead(sd))
break;
- if (pc_cant_act(sd))
+ if ( pc_cant_act2(sd) )
break;
if (sd->sc.count && (
@@ -10180,7 +10180,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
if (sd->npc_id != sd->npc_item_flag)
return;
}
- else if (pc_istrading(sd))
+ else if ( pc_istrading(sd) || sd->chatID )
return;
//Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex]
@@ -10213,7 +10213,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
return;
} else if (sd->state.storage_flag || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes
- else if (pc_cant_act(sd))
+ else if ( pc_cant_act2(sd) )
return;
if(!sd->status.inventory[index].identify) {
@@ -10250,7 +10250,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
if (sd->state.storage_flag || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes
- else if (pc_cant_act(sd))
+ else if ( pc_cant_act2(sd) )
return;
index = RFIFOW(fd,2)-2;
@@ -10272,7 +10272,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
return;
}
- if (pc_cant_act(sd))
+ if ( pc_cant_act2(sd) )
return;
bl = map_id2bl(RFIFOL(fd,2));