summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-01-01 11:56:21 -0500
committergumi <git@gumi.ca>2018-01-01 11:56:21 -0500
commitb0c2e79e68bb1f455eba723bcebefeb06db3b70b (patch)
tree42db68011699915c2805b3f7427236b19453f8a4
parenteb6d8530fa2c81a3b90fca916e9c3c22ed3ff78b (diff)
downloadtmwa-b0c2e79e68bb1f455eba723bcebefeb06db3b70b.tar.gz
tmwa-b0c2e79e68bb1f455eba723bcebefeb06db3b70b.tar.bz2
tmwa-b0c2e79e68bb1f455eba723bcebefeb06db3b70b.tar.xz
tmwa-b0c2e79e68bb1f455eba723bcebefeb06db3b70b.zip
no longer force-crash on fatal script errors
-rw-r--r--src/map/script-call.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index 2e90432..d54e234 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -720,7 +720,6 @@ void run_func(ScriptState *st)
dumb_ptr<npc_data> nd = map_id_is_npc(st->oid);
PRINTF("run_func: return without callfunc or callsub! @ %s\n"_fmt,
nd ? nd->name : NpcName());
- abort();
}
assert (olddefsp == st->defsp); // pretty sure it hasn't changed yet
st->scriptp.code = Some(conv_script(st, &st->stack->stack_datav[olddefsp - 1])); // スクリプトを復元
@@ -817,7 +816,6 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
dumb_ptr<npc_data> nd = map_id_is_npc(st->oid);
PRINTF("run_script: infinity loop! @ %s\n"_fmt,
nd ? nd->name : NpcName());
- abort();
}
}
break;
@@ -879,7 +877,6 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
dumb_ptr<npc_data> nd = map_id_is_npc(st->oid);
PRINTF("run_script: infinity loop! @ %s\n"_fmt,
nd ? nd->name : NpcName());
- abort();
}
}
dumb_ptr<map_session_data> sd = map_id2sd(st->rid);