diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-18 08:44:27 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-18 08:44:27 +0000 |
| commit | db15814cc463589087a9825dd6012126f89cb261 (patch) | |
| tree | ae133d196b0a6d9ede41a9cd0c11b28d6257f9c5 /src/map/pc.c | |
| parent | 5cf841f555c2d61390e4a3ff835b2c3eade84190 (diff) | |
| download | hercules-db15814cc463589087a9825dd6012126f89cb261.tar.gz hercules-db15814cc463589087a9825dd6012126f89cb261.tar.bz2 hercules-db15814cc463589087a9825dd6012126f89cb261.tar.xz hercules-db15814cc463589087a9825dd6012126f89cb261.zip | |
Fixed OnPCLoginEvent not working correctly (bugreport:1182).
Cleaned up some code typos/engrish.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12391 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 9d8ef409b..5845fe56e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -569,7 +569,7 @@ bool pc_can_Adopt(struct map_session_data *p1_sd, struct map_session_data *p2_sd return false; if( b_sd->status.father || b_sd->status.mother || b_sd->adopt_invite ) - return false; // allready adopted baby / in adopt request + return false; // already adopted baby / in adopt request if( !p1_sd->status.partner_id || !p1_sd->status.party_id || p1_sd->status.party_id != b_sd->status.party_id ) return false; // You need to be married and in party with baby to adopt @@ -587,13 +587,13 @@ bool pc_can_Adopt(struct map_session_data *p1_sd, struct map_session_data *p2_sd if( !pc_isequipped(p2_sd, WEDDING_RING_M) && !pc_isequipped(p2_sd, WEDDING_RING_F) ) return false; - // Allready adopted a baby + // Already adopted a baby if( p1_sd->status.child || p2_sd->status.child ) { clif_Adopt_reply(p1_sd, 0); return false; } - // Fathers need at least lvl 70 to adopt + // Parents need at least lvl 70 to adopt if( p1_sd->status.base_level < 70 || p2_sd->status.base_level < 70 ) { clif_Adopt_reply(p1_sd, 1); return false; @@ -604,7 +604,10 @@ bool pc_can_Adopt(struct map_session_data *p1_sd, struct map_session_data *p2_sd return false; } - return ( b_sd->status.class_ >= JOB_NOVICE && b_sd->status.class_ <= JOB_THIEF ); + if( !(b_sd->status.class_ >= JOB_NOVICE && b_sd->status.class_ <= JOB_THIEF) ) + return false; + + return true; } /*========================================== |