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

Converted some packets to structs (#8332)

Browse Source
This commit is contained in:
Atemo
2024-05-20 21:13:59 +02:00
committed by GitHub
parent c83f41a5a3
commit d1cf6f4ac7
13 changed files with 300 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/pc.cpp
View File

@@ -6186,7 +6186,7 @@ bool pc_isUseitem(map_session_data *sd,int n)
if( itemdb_group.item_exists( IG_MF_NOTELEPORT, nameid ) ){
if( ( mapdata->getMapFlag(MF_NOTELEPORT) || mapdata_flag_gvg2( mapdata ) ) ){
clif_skill_teleportmessage( sd, 0 );
clif_skill_teleportmessage( *sd, NOTIFY_MAPINFO_CANT_TP );
return false;
}
@@ -7070,7 +7070,7 @@ bool pc_memo(map_session_data* sd, int pos)
// check mapflags
if( sd->bl.m >= 0 && (map_getmapflag(sd->bl.m, MF_NOMEMO) || map_getmapflag(sd->bl.m, MF_NOWARPTO)) && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE) ) {
clif_skill_teleportmessage(sd, 1); // "Saved point cannot be memorized."
clif_skill_teleportmessage( *sd, NOTIFY_MAPINFO_CANT_MEMO ); // "Saved point cannot be memorized."
return false;
}
@@ -7081,11 +7081,11 @@ bool pc_memo(map_session_data* sd, int pos)
// check required skill level
skill = pc_checkskill(sd, AL_WARP);
if( skill < 1 ) {
clif_skill_memomessage(sd,2); // "You haven't learned Warp."
clif_skill_memomessage( *sd, WARPPOINT_NOT_LEARNED ); // "You haven't learned Warp."
return false;
}
if( skill < 2 || skill - 2 < pos ) {
clif_skill_memomessage(sd,1); // "Skill Level is not high enough."
clif_skill_memomessage( *sd, WARPPOINT_LOW_LEVEL ); // "Skill Level is not high enough."
return false;
}
@@ -7109,7 +7109,7 @@ bool pc_memo(map_session_data* sd, int pos)
sd->status.memo_point[pos].x = sd->bl.x;
sd->status.memo_point[pos].y = sd->bl.y;
clif_skill_memomessage(sd, 0);
clif_skill_memomessage( *sd, WARPPOINT_SUCCESS );
return true;
}
@@ -9489,7 +9489,7 @@ void pc_respawn(map_session_data* sd, clr_type clrtype)
pc_setstand(sd, true);
pc_setrestartvalue(sd,3);
if( pc_setpos( sd, mapindex_name2id( sd->status.save_point.map ), sd->status.save_point.x, sd->status.save_point.y, clrtype ) != SETPOS_OK ){
clif_resurrection(&sd->bl, 1); //If warping fails, send a normal stand up packet.
clif_resurrection( sd->bl ); //If warping fails, send a normal stand up packet.
}
}
@@ -9608,7 +9608,7 @@ int pc_dead(map_session_data *sd,struct block_list *src)
sd->state.snovice_dead_flag = 1;
pc_setrestartvalue(sd,1);
status_percent_heal(&sd->bl, 100, 100);
clif_resurrection(&sd->bl, 1);
clif_resurrection( sd->bl );
if(battle_config.pc_invincible_time)
pc_setinvincibletimer(sd, battle_config.pc_invincible_time);
sc_start(&sd->bl,&sd->bl,SC_STEELBODY,100,5,skill_get_time(MO_STEELBODY,5));
@@ -10863,9 +10863,10 @@ bool pc_jobchange(map_session_data *sd,int job, char upper)
status_change_end( &sd->bl, SC_SPIRIT );
}
if(sd->status.manner < 0)
clif_changestatus(sd,SP_MANNER,sd->status.manner);
if(sd->status.manner < 0){
clif_changemanner( *sd );
clif_updatestatus(*sd,SP_MANNER);
}
status_calc_pc(sd,SCO_FORCE);
pc_checkallowskill(sd);
pc_equiplookall(sd);
@@ -11973,7 +11974,7 @@ bool pc_equipitem(map_session_data *sd,short n,int req_pos,bool equipswitch)
pc_equipswitch_remove(sd, n);
if(pos==EQP_AMMO) {
clif_arrowequip(sd,n);
clif_arrowequip( *sd );
clif_arrow_fail(sd,3);
}
else