summaryrefslogtreecommitdiff
path: root/src/map/chrif.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-04 00:49:50 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-07 12:54:23 -0800
commitc67c2b7435a13d7ce17b2075e22dc5c6036f702a (patch)
treeb84b7b205a361b39d65944a9edb2a353356a9ac9 /src/map/chrif.cpp
parentb3a0b3e7c94bce46bc0654528df0748cf0c2a6ac (diff)
downloadtmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.gz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.bz2
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.xz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.zip
Remove some more Skill-related stuff
Diffstat (limited to 'src/map/chrif.cpp')
-rw-r--r--src/map/chrif.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 018c659..302d04c 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -752,7 +752,8 @@ int chrif_divorce(int char_id, int partner_id)
}
}
- nullpo_ret(sd = map_nick2sd(map_charid2nick(partner_id)));
+ sd = map_nick2sd(map_charid2nick(partner_id));
+ nullpo_ret(sd);
if (sd->status.partner_id == char_id)
sd->status.partner_id = 0;