summaryrefslogtreecommitdiff
path: root/src/map/script-fun.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-11-04 22:28:16 -0800
committerBen Longbons <b.r.longbons@gmail.com>2014-11-04 22:28:16 -0800
commit0bc322efc087ab0c7b53709e5e20ac76aee761de (patch)
treec656fb93447bc7268920f020c8459c7392abce6d /src/map/script-fun.cpp
parentad98bbcff7d6385dbcc4b2c7d393c7f16420ebdd (diff)
downloadtmwa-0bc322efc087ab0c7b53709e5e20ac76aee761de.tar.gz
tmwa-0bc322efc087ab0c7b53709e5e20ac76aee761de.tar.bz2
tmwa-0bc322efc087ab0c7b53709e5e20ac76aee761de.tar.xz
tmwa-0bc322efc087ab0c7b53709e5e20ac76aee761de.zip
Perform divorces asynchronously to avoid crashes
Diffstat (limited to 'src/map/script-fun.cpp')
-rw-r--r--src/map/script-fun.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 69aee10..c38f498 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2209,10 +2209,6 @@ void builtin_divorce(ScriptState *st)
{
dumb_ptr<map_session_data> sd = script_rid2sd(st);
- st->state = ScriptEndState::STOP; // rely on pc_divorce to restart
-
- sd->npc_flags.divorce = 1;
-
if (sd == nullptr || pc_divorce(sd) < 0)
{
push_int<ScriptDataInt>(st->stack, 0);