summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-18 15:01:18 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-18 15:01:18 +0000
commit4add6a5ba3b45cf97a3731a8a38577e7506bca30 (patch)
tree9fd52a653f7f03fe29b27017e703026fcf23d428 /src/map
parentb9e50a1dcc19e83de8067a4aab688c12a0aab671 (diff)
downloadhercules-4add6a5ba3b45cf97a3731a8a38577e7506bca30.tar.gz
hercules-4add6a5ba3b45cf97a3731a8a38577e7506bca30.tar.bz2
hercules-4add6a5ba3b45cf97a3731a8a38577e7506bca30.tar.xz
hercules-4add6a5ba3b45cf97a3731a8a38577e7506bca30.zip
- removed redundant clif_hominfo line in merc_hom_dead (it was sent already from hom_damage)
- Item usage is now blocked while hidden. - Moved the bladestop/berserk check from clif_parse_EquipItem to pc_equipitem git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11942 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/mercenary.c1
-rw-r--r--src/map/pc.c6
3 files changed, 3 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 957154a3d..8a0b2f66a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8631,9 +8631,6 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
else if (pc_cant_act(sd))
return;
- if(sd->sc.data[SC_BLADESTOP] || sd->sc.data[SC_BERSERK])
- return;
-
if(!sd->status.inventory[index].identify) {
clif_equipitemack(sd,index,0,0); // fail
return;
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 9030e6e90..3e3d8a906 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -76,7 +76,6 @@ int merc_hom_dead(struct homun_data *hd, struct block_list *src)
if (!sd) //unit remove map will invoke unit free
return 3;
- clif_hominfo(sd,hd,0); // Send dead flag
clif_emotion(&sd->bl, 28) ; //sob
//Remove from map (if it has no intimacy, it is auto-removed from memory)
return 3;
diff --git a/src/map/pc.c b/src/map/pc.c
index 7d8a44e2e..13065ea24 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3079,6 +3079,7 @@ int pc_useitem(struct map_session_data *sd,int n)
(sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) ||
sd->sc.data[SC_TRICKDEAD] ||
sd->sc.data[SC_BLADESTOP] ||
+ sd->sc.data[SC_HIDING] ||
(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM)
))
return 0;
@@ -6325,9 +6326,8 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
return 0;
}
-// -- moonsoul (if player is berserk then cannot equip)
-//
- if(sd->sc.data[SC_BERSERK]){
+ if(sd->sc.data[SC_BERSERK] || sd->sc.data[SC_BLADESTOP])
+ {
clif_equipitemack(sd,n,0,0); // fail
return 0;
}