summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-18 04:32:20 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-18 04:32:20 +0000
commitfd42f3d7e7a803d997a82c25a9f7b853797a6aa3 (patch)
tree7cc429cee5aea97fda5fb1d5dc4cd58e146df860 /src/map/guild.c
parentc7ee688020983ae148eabb853b7cf5bae00fd32d (diff)
downloadhercules-fd42f3d7e7a803d997a82c25a9f7b853797a6aa3.tar.gz
hercules-fd42f3d7e7a803d997a82c25a9f7b853797a6aa3.tar.bz2
hercules-fd42f3d7e7a803d997a82c25a9f7b853797a6aa3.tar.xz
hercules-fd42f3d7e7a803d997a82c25a9f7b853797a6aa3.zip
- Added the official adoption method.
( Parents need to create a party, invite a novice/first class, both equip the wedding rings and someone just right click the future baby ). - Fixed a bug sometimes client don't show job's bonus stats. - Removed the problematic adoption script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12389 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 5644793b2..ed35aaccb 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -618,7 +618,7 @@ int guild_invite(struct map_session_data *sd,struct map_session_data *tsd)
return 0; //Invite permission.
if(!battle_config.invite_request_check) {
- if (tsd->party_invite>0 || tsd->trade_partner) { // 相手が取引中かどうか
+ if (tsd->party_invite>0 || tsd->trade_partner || tsd->adopt_invite ) { // 相手が取引中かどうか
clif_guild_inviteack(sd,0);
return 0;
}