summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-21 22:52:19 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-21 22:52:19 +0000
commiteba83e0231886458138a7344ce7beaa32087b6a7 (patch)
treed71e1c01201da874a86a434ea3fe2d1ef7b327d6 /src/map
parentd1762b173630883123e6a9f6e8f48fec69f33c53 (diff)
downloadhercules-eba83e0231886458138a7344ce7beaa32087b6a7.tar.gz
hercules-eba83e0231886458138a7344ce7beaa32087b6a7.tar.bz2
hercules-eba83e0231886458138a7344ce7beaa32087b6a7.tar.xz
hercules-eba83e0231886458138a7344ce7beaa32087b6a7.zip
Fixed Deep Sleep not being removed by status effects etc, bugreport:5475
Also Fixed 2 gcc warnings on status.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15742 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c
index e537b800e..cd70b75e6 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1034,14 +1034,14 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
status_change_end(target, SC_CHASEWALK, INVALID_TIMER);
status_change_end(target, SC_CAMOUFLAGE, INVALID_TIMER);
status_change_end(target, SC__INVISIBILITY, INVALID_TIMER);
+ status_change_end(target, SC_DEEPSLEEP, INVALID_TIMER);
if ((sce=sc->data[SC_ENDURE]) && !sce->val4) {
//Endure count is only reduced by non-players on non-gvg maps.
//val4 signals infinite endure. [Skotlex]
if (src && src->type != BL_PC && !map_flag_gvg(target->m) && !map[target->m].flag.battleground && --(sce->val2) < 0)
status_change_end(target, SC_ENDURE, INVALID_TIMER);
}
- if ((sce=sc->data[SC_GRAVITATION]) && sce->val3 == BCT_SELF)
- {
+ if ((sce=sc->data[SC_GRAVITATION]) && sce->val3 == BCT_SELF) {
struct skill_unit_group* sg = skill_id2group(sce->val4);
if (sg) {
skill_delunitgroup(sg);
@@ -2331,7 +2331,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
wa = &status->rhw;
}
wa->atk += sd->inventory_data[index]->atk;
- if (r = sd->status.inventory[index].refine)
+ if ( (r = sd->status.inventory[index].refine) )
wa->atk2 = refine_info[wlv].bonus[r-1] / 100;
#if REMODE
/**
@@ -2378,7 +2378,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
}
else if(sd->inventory_data[index]->type == IT_ARMOR) {
int r;
- if (r = sd->status.inventory[index].refine)
+ if ( (r = sd->status.inventory[index].refine) )
refinedef += refine_info[REFINE_TYPE_ARMOR].bonus[r-1];
if(sd->inventory_data[index]->script) {
if( i == EQI_HAND_L ) //Shield