Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Deep Sleep not being removed by status effects etc, bugreport:5475

Browse Source 
Also Fixed 2 gcc warnings on status.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15742 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-03-21 22:52:19 +00:00
parent 1bf2eccd8b
commit 1afef8ed53
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/status.c
View File

@ -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_CHASEWALK, INVALID_TIMER);
status_change_end(target, SC_CAMOUFLAGE, INVALID_TIMER); status_change_end(target, SC_CAMOUFLAGE, INVALID_TIMER);
status_change_end(target, SC__INVISIBILITY, 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) { if ((sce=sc->data[SC_ENDURE]) && !sce->val4) {
//Endure count is only reduced by non-players on non-gvg maps. //Endure count is only reduced by non-players on non-gvg maps.
//val4 signals infinite endure. [Skotlex] //val4 signals infinite endure. [Skotlex]
if (src && src->type != BL_PC && !map_flag_gvg(target->m) && !map[target->m].flag.battleground && --(sce->val2) < 0) 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); 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); struct skill_unit_group* sg = skill_id2group(sce->val4);
if (sg) { if (sg) {
skill_delunitgroup(sg); skill_delunitgroup(sg);
@ -2331,7 +2331,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
wa = &status->rhw; wa = &status->rhw;
} }
wa->atk += sd->inventory_data[index]->atk; 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; wa->atk2 = refine_info[wlv].bonus[r-1] / 100;
#if REMODE #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) { else if(sd->inventory_data[index]->type == IT_ARMOR) {
int r; 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]; refinedef += refine_info[REFINE_TYPE_ARMOR].bonus[r-1];
if(sd->inventory_data[index]->script) { if(sd->inventory_data[index]->script) {
if( i == EQI_HAND_L ) //Shield if( i == EQI_HAND_L ) //Shield