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

- Fixed a fake nullpo when parsing the reply to a guild alliance request.

Browse Source 
- Fixed the position of a nullpo in guild.c


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9164 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-11-07 16:39:33 +00:00
parent 9ef52ebac7
commit 23ebb95f4d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/guild.c
View File

@ -1319,7 +1319,11 @@ int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag)
struct map_session_data *tsd; struct map_session_data *tsd;
nullpo_retr(0, sd); nullpo_retr(0, sd);
nullpo_retr(0, tsd= map_id2sd( account_id )); tsd= map_id2sd( account_id );
if (!tsd) { //Character left? Cancel alliance.
clif_guild_allianceack(sd,3);
return 0;
}
if(sd->guild_alliance!=tsd->status.guild_id) // 勧誘とギルドIDが違う if(sd->guild_alliance!=tsd->status.guild_id) // 勧誘とギルドIDが違う
return 0; return 0;
@ -1370,13 +1374,13 @@ int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag)
// ギルド関係解消 // ギルド関係解消
int guild_delalliance(struct map_session_data *sd,int guild_id,int flag) int guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
{ {
nullpo_retr(0, sd);
if(agit_flag) { // Disable alliance breaking during woe [Valaris] if(agit_flag) { // Disable alliance breaking during woe [Valaris]
clif_displaymessage(sd->fd,"Alliances cannot be broken during Guild Wars!"); clif_displaymessage(sd->fd,"Alliances cannot be broken during Guild Wars!");
return 0; return 0;
} // end addition [Valaris] } // end addition [Valaris]
nullpo_retr(0, sd);
intif_guild_alliance( sd->status.guild_id,guild_id, intif_guild_alliance( sd->status.guild_id,guild_id,
sd->status.account_id,0,flag|8 ); sd->status.account_id,0,flag|8 );
return 0; return 0;