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

Added a flag to skill_delunitgroup, skill_delunit & skill_unit_onlimit.

Browse Source 
If 1 is passed, it will avoid UNT_WARP_ACTIVE to be transformed in UNT_WARP_WAITING and will destroy it. [Toms]
( To avoid such crash : http://www.eathena.ws/board/index.php?showtopic=114102 when the code need an empty slot and the oldest one is UNT_WARP_ACTIVE )

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8478 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2006-08-25 11:07:30 +00:00
parent 8a714e14ad
commit 44880dc493
6 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog-Trunk.txt
View File

@ -3,6 +3,12 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/25
* Added a flag to skill_delunitgroup, skill_delunit & skill_unit_onlimit.
If 1 is passed, it will avoid UNT_WARP_ACTIVE to be transformed in
UNT_WARP_WAITING and will destroy it. [Toms]
( To avoid such crash : http://www.eathena.ws/board/index.php?showtopic=114102
when the code need an empty slot and the oldest one is UNT_WARP_ACTIVE )
2006/08/24 2006/08/24
* Little cleanup on homunc's code [Toms] * Little cleanup on homunc's code [Toms]
* Modified @reloadmobdb & @reloadskilldb to reload homunc's db too [Toms] * Modified @reloadmobdb & @reloadskilldb to reload homunc's db too [Toms]

2
src/map/battle.c
View File

@ -263,7 +263,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL].val3; struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL].val3;
if (group) { if (group) {
if (--group->val2<=0) if (--group->val2<=0)
skill_delunitgroup(NULL,group); skill_delunitgroup(NULL,group,0);
return 0; return 0;
} }
status_change_end(bl,SC_SAFETYWALL,-1); status_change_end(bl,SC_SAFETYWALL,-1);

2
src/map/map.c
View File

@ -3623,7 +3623,7 @@ int cleanup_sub(struct block_list *bl, va_list ap) {
map_clearflooritem(bl->id); map_clearflooritem(bl->id);
break; break;
case BL_SKILL: case BL_SKILL:
skill_delunit((struct skill_unit *) bl); skill_delunit((struct skill_unit *) bl, 1);
break; break;
} }

59
src/map/skill.c
View File

@ -2484,7 +2484,7 @@ int skill_count_water (struct block_list *src, int range)
unit = map_find_skill_unit_oncell(src,x,y,NJ_SUITON,NULL); unit = map_find_skill_unit_oncell(src,x,y,NJ_SUITON,NULL);
if (unit) { if (unit) {
cnt++; cnt++;
skill_delunit(unit); skill_delunit(unit, 1);
} }
} }
return cnt; return cnt;
@ -5039,7 +5039,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
} }
} }
} }
skill_delunit(su); skill_delunit(su, 1);
} }
} }
break; break;
@ -6785,7 +6785,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
if (!group->alive_count) if (!group->alive_count)
{ //No cells? Something that was blocked completely by Land Protector? { //No cells? Something that was blocked completely by Land Protector?
skill_delunitgroup(src, group); skill_delunitgroup(src, group, 1);
return NULL; return NULL;
} }
if (skillid == NJ_TATAMIGAESHI) //Store number of tiles. if (skillid == NJ_TATAMIGAESHI) //Store number of tiles.
@ -6839,7 +6839,7 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
&& sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) { && sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) {
if (pc_setpos(sd,sg->val3,sg->val2>>16,sg->val2&0xffff,3) == 0) { if (pc_setpos(sd,sg->val3,sg->val2>>16,sg->val2&0xffff,3) == 0) {
if (--sg->val1<=0) if (--sg->val1<=0)
skill_delunitgroup(NULL, sg); skill_delunitgroup(NULL, sg, 0);
} }
} }
} else } else
@ -7008,7 +7008,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
src->val2--; src->val2--;
} }
if (src->val2<=0) if (src->val2<=0)
skill_delunit(src); skill_delunit(src, 0);
break; break;
} }
@ -7031,7 +7031,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
sg->val1--; sg->val1--;
} }
if (sg->val1 <= 0) if (sg->val1 <= 0)
skill_delunitgroup(NULL,sg); skill_delunitgroup(NULL,sg, 0);
break; break;
case UNT_MAGNUS: case UNT_MAGNUS:
@ -7061,7 +7061,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
case UNT_FIREPILLAR_WAITING: case UNT_FIREPILLAR_WAITING:
skill_unitsetting(ss,sg->skill_id,sg->skill_lv,src->bl.x,src->bl.y,1); skill_unitsetting(ss,sg->skill_id,sg->skill_lv,src->bl.x,src->bl.y,1);
skill_delunit(src); skill_delunit(src, 0);
break; break;
case UNT_FIREPILLAR_ACTIVE: case UNT_FIREPILLAR_ACTIVE:
@ -7290,7 +7290,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
case UNT_KAENSIN: case UNT_KAENSIN:
skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
if (--src->val2 <= 0) if (--src->val2 <= 0)
skill_delunit(src); skill_delunit(src, 0);
break; break;
} }
@ -7514,10 +7514,10 @@ int skill_unit_effect (struct block_list *bl, va_list ap)
} }
/*========================================== /*==========================================
* * If flag = 1, skill must be deleted, not transformed
*------------------------------------------ *------------------------------------------
*/ */
int skill_unit_onlimit (struct skill_unit *src, unsigned int tick) int skill_unit_onlimit (struct skill_unit *src, unsigned int tick, int flag)
{ {
struct skill_unit_group *sg; struct skill_unit_group *sg;
nullpo_retr(0, src); nullpo_retr(0, src);
@ -7525,6 +7525,7 @@ int skill_unit_onlimit (struct skill_unit *src, unsigned int tick)
switch(sg->unit_id){ switch(sg->unit_id){
case UNT_WARP_ACTIVE: case UNT_WARP_ACTIVE:
if (!flag)
skill_unitsetting(&src->bl,sg->skill_id,sg->skill_lv,src->bl.x,src->bl.y,1); skill_unitsetting(&src->bl,sg->skill_id,sg->skill_lv,src->bl.x,src->bl.y,1);
break; break;
@ -7571,7 +7572,7 @@ int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, int dam
nullpo_retr(0, sg=src->group); nullpo_retr(0, sg=src->group);
if (skill_get_inf2(sg->skill_id)&INF2_TRAP && damage > 0) if (skill_get_inf2(sg->skill_id)&INF2_TRAP && damage > 0)
skill_delunitgroup(NULL,sg); skill_delunitgroup(NULL,sg, 0);
else else
switch(sg->unit_id){ switch(sg->unit_id){
case UNT_ICEWALL: case UNT_ICEWALL:
@ -9221,7 +9222,7 @@ int skill_clear_group (struct block_list *bl, int flag)
} }
for (i=0;i<count;i++) for (i=0;i<count;i++)
skill_delunitgroup(bl, group[i]); skill_delunitgroup(bl, group[i], 1);
return count; return count;
} }
@ -9261,7 +9262,7 @@ int skill_graffitiremover (struct block_list *bl, va_list ap)
return 0; return 0;
if((unit->group) && (unit->group->unit_id == UNT_GRAFFITI)) if((unit->group) && (unit->group->unit_id == UNT_GRAFFITI))
skill_delunit(unit); skill_delunit(unit, 0);
return 0; return 0;
} }
@ -9307,14 +9308,14 @@ int skill_landprotector (struct block_list *bl, va_list ap)
battle_check_target(bl, src, BCT_ENEMY) > 0) battle_check_target(bl, src, BCT_ENEMY) > 0)
{ //Check for offensive Land Protector to delete both. [Skotlex] { //Check for offensive Land Protector to delete both. [Skotlex]
(*alive) = 0; (*alive) = 0;
skill_delunit(unit); skill_delunit(unit, 0);
return 1; return 1;
} }
//Delete the rest of types. //Delete the rest of types.
case HW_GANBANTEIN: case HW_GANBANTEIN:
if(skill_get_type(unit->group->skill_id) == BF_MAGIC) if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
{ //Delete Magical effects { //Delete Magical effects
skill_delunit(unit); skill_delunit(unit, 1);
return 1; return 1;
} }
break; break;
@ -9370,8 +9371,8 @@ int skill_ganbatein (struct block_list *bl, va_list ap)
// return 0; //Do not remove traps. // return 0; //Do not remove traps.
if (unit->group->skill_id == SA_LANDPROTECTOR) if (unit->group->skill_id == SA_LANDPROTECTOR)
skill_delunit(unit); skill_delunit(unit, 0);
else skill_delunitgroup(NULL, unit->group); else skill_delunitgroup(NULL, unit->group, 1);
return 1; return 1;
} }
@ -9556,7 +9557,7 @@ void skill_stop_dancing (struct block_list *src)
} }
if (group) if (group)
skill_delunitgroup(NULL, group); skill_delunitgroup(NULL, group, 0);
if (dsd) if (dsd)
{ {
@ -9618,10 +9619,10 @@ struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int
} }
/*========================================== /*==========================================
* * If flag = 1, skill must be deleted, not transformed
*------------------------------------------ *------------------------------------------
*/ */
int skill_delunit (struct skill_unit *unit) int skill_delunit (struct skill_unit *unit, int flag)
{ {
struct skill_unit_group *group; struct skill_unit_group *group;
@ -9630,7 +9631,7 @@ int skill_delunit (struct skill_unit *unit)
return 0; return 0;
nullpo_retr(0, group=unit->group); nullpo_retr(0, group=unit->group);
skill_unit_onlimit( unit,gettick() ); skill_unit_onlimit( unit,gettick(), flag);
if (group->state.song_dance&0x1) //Restore dissonance effect. if (group->state.song_dance&0x1) //Restore dissonance effect.
skill_dance_overlap(unit, 0); skill_dance_overlap(unit, 0);
@ -9664,7 +9665,7 @@ int skill_delunit (struct skill_unit *unit)
unit->alive=0; unit->alive=0;
map_delobjectnofree(unit->bl.id); map_delobjectnofree(unit->bl.id);
if(--group->alive_count==0) if(--group->alive_count==0)
skill_delunitgroup(NULL, group); skill_delunitgroup(NULL, group, 0);
return 0; return 0;
} }
@ -9694,7 +9695,7 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, int count,
maxdiff=x; maxdiff=x;
j=i; j=i;
} }
skill_delunitgroup(src, ud->skillunit[j]); skill_delunitgroup(src, ud->skillunit[j], 1); // Force the deletion !
//Since elements must have shifted, we use the last slot. //Since elements must have shifted, we use the last slot.
i = MAX_SKILLUNITGROUP-1; i = MAX_SKILLUNITGROUP-1;
} }
@ -9742,10 +9743,10 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, int count,
} }
/*========================================== /*==========================================
* * If flag == 1, skill must be deleted (not transformed like UNT_WAARP)
*------------------------------------------ *------------------------------------------
*/ */
int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group) int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group, int flag)
{ {
struct unit_data *ud; struct unit_data *ud;
int i,j; int i,j;
@ -9792,7 +9793,7 @@ int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group)
if(group->unit!=NULL){ if(group->unit!=NULL){
for(i=0;i<group->unit_count;i++) for(i=0;i<group->unit_count;i++)
if(group->unit[i].alive) if(group->unit[i].alive)
skill_delunit(&group->unit[i]); skill_delunit(&group->unit[i], flag);
} }
if(group->valstr!=NULL){ if(group->valstr!=NULL){
aFree(group->valstr); aFree(group->valstr);
@ -9828,7 +9829,7 @@ int skill_clear_unitgroup (struct block_list *src)
nullpo_retr(0, ud); nullpo_retr(0, ud);
while (ud->skillunit[0]) while (ud->skillunit[0])
skill_delunitgroup(src, ud->skillunit[0]); skill_delunitgroup(src, ud->skillunit[0], 1);
return 1; return 1;
} }
@ -9979,7 +9980,7 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap)
item_tmp.identify=1; item_tmp.identify=1;
map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,NULL,NULL,NULL,0); map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,NULL,NULL,NULL,0);
} }
skill_delunit(unit); skill_delunit(unit, 0);
} }
break; break;
@ -9995,7 +9996,7 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap)
break; break;
default: default:
skill_delunit(unit); skill_delunit(unit, 0);
} }
} }

4
src/map/skill.h
View File

@ -195,10 +195,10 @@ int skill_break_equip(struct block_list *bl, unsigned short where, int rate, int
// ユニットスキル // ユニットスキル
struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid,int skilllv,int x,int y,int flag); struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid,int skilllv,int x,int y,int flag);
struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int x, int y, int val1, int val2);
int skill_delunit(struct skill_unit *unit); int skill_delunit(struct skill_unit *unit, int flag);
struct skill_unit_group *skill_initunitgroup(struct block_list *src, struct skill_unit_group *skill_initunitgroup(struct block_list *src,
int count,int skillid,int skilllv,int unit_id, int limit, int interval); int count,int skillid,int skilllv,int unit_id, int limit, int interval);
int skill_delunitgroup(struct block_list *src, struct skill_unit_group *group); int skill_delunitgroup(struct block_list *src, struct skill_unit_group *group, int flag);
int skill_clear_unitgroup(struct block_list *src); int skill_clear_unitgroup(struct block_list *src);
int skill_clear_group(struct block_list *bl, int flag); int skill_clear_group(struct block_list *bl, int flag);

8
src/map/status.c
View File

@ -623,7 +623,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
sc->data[SC_GRAVITATION].val3 == BCT_SELF) { sc->data[SC_GRAVITATION].val3 == BCT_SELF) {
struct skill_unit_group *sg = (struct skill_unit_group *)sc->data[SC_GRAVITATION].val4; struct skill_unit_group *sg = (struct skill_unit_group *)sc->data[SC_GRAVITATION].val4;
if (sg) { if (sg) {
skill_delunitgroup(target,sg); skill_delunitgroup(target,sg, 0);
sc->data[SC_GRAVITATION].val4 = 0; sc->data[SC_GRAVITATION].val4 = 0;
status_change_end(target, SC_GRAVITATION, -1); status_change_end(target, SC_GRAVITATION, -1);
} }
@ -5991,7 +5991,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
{ {
group = (struct skill_unit_group *)sc->data[type].val2; group = (struct skill_unit_group *)sc->data[type].val2;
sc->data[type].val2 = 0; sc->data[type].val2 = 0;
skill_delunitgroup(bl, group); skill_delunitgroup(bl, group, 0);
} }
if(sc->data[type].val4 && sc->data[type].val4 != BCT_SELF && (dsd=map_id2sd(sc->data[type].val4))){ if(sc->data[type].val4 && sc->data[type].val4 != BCT_SELF && (dsd=map_id2sd(sc->data[type].val4))){
dsc = &dsd->sc; dsc = &dsd->sc;
@ -6092,7 +6092,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
if (sc->data[type].val3) { //Clear the group. if (sc->data[type].val3) { //Clear the group.
struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val3; struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val3;
sc->data[type].val3 = 0; sc->data[type].val3 = 0;
skill_delunitgroup(bl, group); skill_delunitgroup(bl, group, 0);
} }
break; break;
case SC_HERMODE: case SC_HERMODE:
@ -6112,7 +6112,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
if (sc->data[type].val4) { //Clear the group. if (sc->data[type].val4) { //Clear the group.
struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val4; struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val4;
sc->data[type].val4 = 0; sc->data[type].val4 = 0;
skill_delunitgroup(bl, group); skill_delunitgroup(bl, group, 0);
} }
break; break;
case SC_KAAHI: case SC_KAAHI: