summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-07-07 11:02:29 -0700
committermalufett <malufett.eat.my.binaries@gmail.com>2013-07-07 11:02:29 -0700
commitcf56f7c9142ae164d4e093807f1e7def3471afbd (patch)
tree4207a2dec5349c47ef844b2f35080cdb0050c3f5 /src/map/pc.c
parent8a127e11bfaf108cc66865dd4b1a379da2416f46 (diff)
downloadhercules-cf56f7c9142ae164d4e093807f1e7def3471afbd.tar.gz
hercules-cf56f7c9142ae164d4e093807f1e7def3471afbd.tar.bz2
hercules-cf56f7c9142ae164d4e093807f1e7def3471afbd.tar.xz
hercules-cf56f7c9142ae164d4e093807f1e7def3471afbd.zip
Fixed Bug#6503
-where SR_GENTLETOUCH_REVITALIZE is not working properly. Fixed Bug#6547 & Bug#6141 -SC_BLOODYLUST should now work properly like as official behavior. Fixed Bug#7395 -SO_SPELLFIST should now work properly. Fixed Bug#7477 -removed hidden walkdaley that makes character stop when hit even if SC_ENDURE is active. Fixed Bug#7475 -fixed error message in SA_AUTOSPELL when cancel button is pressed. Fixed Bug#7337 -MG_CHANGECART should now work properly. Fixed Bug#7474 -SC_MAELSTROM should now work properly like as official behavior.
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index b14a02ed4..87e80c264 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4193,7 +4193,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
case 12243: // Mercenary's Berserk Potion
if( sd->md == NULL || sd->md->db == NULL )
return 0;
- if (sd->md->sc.data[SC_BERSERK] || sd->md->sc.data[SC_SATURDAY_NIGHT_FEVER] || sd->md->sc.data[SC__BLOODYLUST])
+ if (sd->md->sc.data[SC_BERSERK] || sd->md->sc.data[SC_SATURDAY_NIGHT_FEVER])
return 0;
if( nameid == 12242 && sd->md->db->lv < 40 )
return 0;
@@ -4294,7 +4294,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
return 0;
if (sd->sc.count && (
- sd->sc.data[SC_BERSERK] || sd->sc.data[SC__BLOODYLUST] ||
+ sd->sc.data[SC_BERSERK] ||
(sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) ||
sd->sc.data[SC_TRICKDEAD] ||
sd->sc.data[SC_HIDING] ||
@@ -8544,7 +8544,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
return 0;
}
- if (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_SATURDAY_NIGHT_FEVER] || sd->sc.data[SC__BLOODYLUST])
+ if (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_SATURDAY_NIGHT_FEVER])
{
clif->equipitemack(sd,n,0,0); // fail
return 0;
@@ -8740,7 +8740,7 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag) {
}
// if player is berserk then cannot unequip
- if (!(flag & 2) && sd->sc.count && (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_SATURDAY_NIGHT_FEVER] || sd->sc.data[SC__BLOODYLUST]))
+ if (!(flag & 2) && sd->sc.count && (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_SATURDAY_NIGHT_FEVER]))
{
clif->unequipitemack(sd,n,0,0);
return 0;