diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
commit | 741230435bd23aa692f552649664b67a43a358c0 (patch) | |
tree | 2f659f9ff3ed0c2b3df3119315047b6f756ef135 /src/map/party.c | |
parent | d21f2f8479c618c15958ae1f9ac5811b9b035921 (diff) | |
download | hercules-741230435bd23aa692f552649664b67a43a358c0.tar.gz hercules-741230435bd23aa692f552649664b67a43a358c0.tar.bz2 hercules-741230435bd23aa692f552649664b67a43a358c0.tar.xz hercules-741230435bd23aa692f552649664b67a43a358c0.zip |
* Merged changes from trunk [14636:14686/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/party.c')
-rw-r--r-- | src/map/party.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/party.c b/src/map/party.c index 407221cde..9c55a05f2 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -298,11 +298,11 @@ int party_recv_info(struct party *sp) int party_invite(struct map_session_data *sd,struct map_session_data *tsd) { - struct party_data *p=party_search(sd->status.party_id); + struct party_data *p; int i,flag=0; nullpo_ret(sd); - if( p == NULL ) + if( ( p = party_search(sd->status.party_id) ) == NULL ) return 0; if( tsd == NULL) { //TODO: Find the correct reply packet. clif_displaymessage(sd->fd, msg_txt(3)); |