diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-24 14:44:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-24 14:44:14 +0000 |
| commit | cd075dd33186145e46c1fb76be879617343db75c (patch) | |
| tree | 617d1b101d6e5cb80b0f116e6b75f8a8c9b8a99f /src/map/chrif.c | |
| parent | 1407fa930fd4be0eb22ab3757b0f41b0a63c2a64 (diff) | |
| download | hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.gz hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.bz2 hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.xz hercules-cd075dd33186145e46c1fb76be879617343db75c.zip | |
- Cleaned up some more the Joint Beat implementation, so the status don't take effect until the attack connects.
- Some minor cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9704 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index ec0ab6aa6..ecd5187c6 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -929,7 +929,7 @@ int chrif_divorce(int char_id, int partner_id) if (!char_id || !partner_id) return 0; - nullpo_retr(0, sd = map_nick2sd(map_charid2nick(partner_id))); + nullpo_retr(0, sd = map_charid2sd(partner_id)); if (sd->status.partner_id == char_id) { int i; //離婚(相方は既にキャラが消えている筈なので) |