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

-Fix bugreport:9070-ranged-forced-attack-movement (now when OFFICIAL_PATH is off and clicking outside target, target is being erased, and no longer attempt to walk back to him)

Browse Source 
-Cleanup / speedup few stuff, and disabled some slave_timer part for review.
This commit is contained in:
lighta 2014-07-15 15:37:42 -04:00
parent 237579c957
commit 7ccd13e904
1 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/map/unit.c
View File

@ -52,7 +52,7 @@ const short diry[8]={1,1,0,-1,-1,-1,0,1}; ///lookup to know where will move to y
//early declaration //early declaration
static int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data); static int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data);
static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data); static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data);
int unit_unattackable(struct block_list *bl);
/** /**
* Get the unit_data related to the bl * Get the unit_data related to the bl
* @param bl : Object to get the unit_data from * @param bl : Object to get the unit_data from
@ -204,8 +204,19 @@ int unit_teleport_timer(int tid, unsigned int tick, int id, intptr_t data)
*/ */
int unit_check_start_teleport_timer(struct block_list *sbl) int unit_check_start_teleport_timer(struct block_list *sbl)
{ {
TBL_PC *msd = unit_get_master(sbl); TBL_PC *msd=NULL;
int max_dist = 0; int max_dist = 0;
switch(sbl->type) {
case BL_HOM:
case BL_ELEM:
case BL_PET:
case BL_MER:
msd = unit_get_master(sbl);
break;
default:
return 0;
}
switch(sbl->type) { switch(sbl->type) {
case BL_HOM: max_dist = AREA_SIZE; break; case BL_HOM: max_dist = AREA_SIZE; break;
case BL_ELEM: max_dist = MAX_ELEDISTANCE; break; case BL_ELEM: max_dist = MAX_ELEDISTANCE; break;
@ -213,7 +224,7 @@ int unit_check_start_teleport_timer(struct block_list *sbl)
case BL_MER: max_dist = MAX_MER_DISTANCE; break; case BL_MER: max_dist = MAX_MER_DISTANCE; break;
} }
// If there is a master and it's a valid type // If there is a master and it's a valid type
if(msd && (msd->bl.type&BL_PC) && max_dist) { ///TODO the bl.type is an hotfix please dig it to remove it if(msd && max_dist) {
int *msd_tid = unit_get_masterteleport_timer(sbl); int *msd_tid = unit_get_masterteleport_timer(sbl);
if(msd_tid == NULL) return 0; if(msd_tid == NULL) return 0;
if (!check_distance_bl(&msd->bl, sbl, max_dist)) { if (!check_distance_bl(&msd->bl, sbl, max_dist)) {
@ -244,23 +255,16 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
uint8 dir; uint8 dir;
struct block_list *bl; struct block_list *bl;
struct unit_data *ud; struct unit_data *ud;
TBL_PC *sd; TBL_PC *sd=NULL;
TBL_MOB *md; TBL_MOB *md=NULL;
TBL_MER *mrd;
TBL_ELEM *ed;
TBL_PET *pd;
TBL_HOM *hd;
bl = map_id2bl(id); bl = map_id2bl(id);
if(bl == NULL) if(bl == NULL)
return 0; return 0;
sd = BL_CAST(BL_PC, bl); switch(bl->type){ //svoid useless cast, we can only be 1 type
md = BL_CAST(BL_MOB, bl); case BL_PC: sd = BL_CAST(BL_PC, bl); break;
mrd = BL_CAST(BL_MER, bl); case BL_MOB: md = BL_CAST(BL_MOB, bl); break;
ed = BL_CAST(BL_ELEM, bl); }
pd = BL_CAST(BL_PET, bl);
hd = BL_CAST(BL_HOM, bl);
ud = unit_bl2ud(bl); ud = unit_bl2ud(bl);
if(ud == NULL) return 0; if(ud == NULL) return 0;
@ -305,7 +309,8 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, sd?BL_ALL:BL_PC, bl); map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, sd?BL_ALL:BL_PC, bl);
ud->walktimer = INVALID_TIMER; ud->walktimer = INVALID_TIMER;
if(sd) { switch(bl->type){
case BL_PC: {
if( sd->touching_id ) if( sd->touching_id )
npc_touchnext_areanpc(sd,false); npc_touchnext_areanpc(sd,false);
if(map_getcell(bl->m,x,y,CELL_CHKNPC)) { if(map_getcell(bl->m,x,y,CELL_CHKNPC)) {
@ -314,14 +319,17 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
return 0; return 0;
} else } else
sd->areanpc_id=0; sd->areanpc_id=0;
/* WIP disable [Lighta], currently unsuported
* this was meant to start the timer if the player move but not his slave...
if(sd->md) unit_check_start_teleport_timer(&sd->md->bl); if(sd->md) unit_check_start_teleport_timer(&sd->md->bl);
if(sd->ed) unit_check_start_teleport_timer(&sd->ed->bl); if(sd->ed) unit_check_start_teleport_timer(&sd->ed->bl);
if(sd->hd) unit_check_start_teleport_timer(&sd->hd->bl); if(sd->hd) unit_check_start_teleport_timer(&sd->hd->bl);
if(sd->pd) unit_check_start_teleport_timer(&sd->pd->bl); if(sd->pd) unit_check_start_teleport_timer(&sd->pd->bl);
*/
pc_cell_basilica(sd); pc_cell_basilica(sd);
} else if (md) { }
break;
case BL_MOB: {
if( map_getcell(bl->m,x,y,CELL_CHKNPC) ) { if( map_getcell(bl->m,x,y,CELL_CHKNPC) ) {
if( npc_touch_areanpc2(md) ) if( npc_touch_areanpc2(md) )
return 0; // Warped return 0; // Warped
@ -342,10 +350,14 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
clif_move(ud); clif_move(ud);
} }
} }
else if (hd) unit_check_start_teleport_timer(&hd->bl); break;
else if (ed) unit_check_start_teleport_timer(&ed->bl); case BL_HOM:
else if (pd) unit_check_start_teleport_timer(&pd->bl); case BL_ELEM:
else if (mrd) unit_check_start_teleport_timer(&mrd->bl); case BL_PET:
case BL_MER:
unit_check_start_teleport_timer(bl);
break;
}
if(tid == INVALID_TIMER) // A directly invoked timer is from battle_stop_walking, therefore the rest is irrelevant. if(tid == INVALID_TIMER) // A directly invoked timer is from battle_stop_walking, therefore the rest is irrelevant.
return 0; return 0;
@ -474,11 +486,14 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
if( (battle_config.max_walk_path < wpd.path_len) && (bl->type != BL_NPC) ) if( (battle_config.max_walk_path < wpd.path_len) && (bl->type != BL_NPC) )
return 0; return 0;
if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 && if (flag&4){
DIFF_TICK(ud->canmove_tick, gettick()) < 2000) unit_unattackable(bl);
{ // Delay walking command. [Skotlex] unit_stop_attack(bl);
add_timer(ud->canmove_tick+1, unit_delay_walktoxy_timer, bl->id, (x<<16)|(y&0xFFFF)); if(DIFF_TICK(ud->canmove_tick, gettick()) > 0 && DIFF_TICK(ud->canmove_tick, gettick()) < 2000)
return 1; { // Delay walking command. [Skotlex]
add_timer(ud->canmove_tick+1, unit_delay_walktoxy_timer, bl->id, (x<<16)|(y&0xFFFF));
return 1;
}
} }
if(!(flag&2) && (!(status_get_mode(bl)&MD_CANMOVE) || !unit_can_move(bl))) if(!(flag&2) && (!(status_get_mode(bl)&MD_CANMOVE) || !unit_can_move(bl)))
@ -504,7 +519,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
delete_timer( ud->attacktimer, unit_attack_timer ); delete_timer( ud->attacktimer, unit_attack_timer );
ud->attacktimer = INVALID_TIMER; ud->attacktimer = INVALID_TIMER;
} }
return unit_walktoxy_sub(bl); return unit_walktoxy_sub(bl);
} }
@ -1817,6 +1832,7 @@ int unit_unattackable(struct block_list *bl)
struct unit_data *ud = unit_bl2ud(bl); struct unit_data *ud = unit_bl2ud(bl);
if (ud) { if (ud) {
ud->state.attack_continue = 0; ud->state.attack_continue = 0;
ud->target_to = 0;
unit_set_target(ud, 0); unit_set_target(ud, 0);
} }