diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-20 01:09:31 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-20 01:09:31 +0000 |
| commit | e76b2ca12d63b4083c0f0cec3544754e87ebdbc1 (patch) | |
| tree | fd8d1cec1c02ec1f131f2ff111de90183fabeafc /src | |
| parent | e8f7c830abf5626ad0ffe446f8f2b1a9733682fb (diff) | |
| download | hercules-e76b2ca12d63b4083c0f0cec3544754e87ebdbc1.tar.gz hercules-e76b2ca12d63b4083c0f0cec3544754e87ebdbc1.tar.bz2 hercules-e76b2ca12d63b4083c0f0cec3544754e87ebdbc1.tar.xz hercules-e76b2ca12d63b4083c0f0cec3544754e87ebdbc1.zip | |
* Fixed pc_marriage not checking spouse character job for baby class.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14471 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/pc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 433b67b46..e93ae8a93 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7394,7 +7394,7 @@ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) { if(sd == NULL || dstsd == NULL || sd->status.partner_id > 0 || dstsd->status.partner_id > 0 || - sd->class_&JOBL_BABY) + (sd->class_&JOBL_BABY) || (dstsd->class_&JOBL_BABY)) return -1; sd->status.partner_id = dstsd->status.char_id; dstsd->status.partner_id = sd->status.char_id; |