diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.cpp | 4 | ||||
| -rw-r--r-- | src/map/script-call.cpp | 26 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 11ca1a3..f50cddf 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -4126,10 +4126,10 @@ ATCE atcommand_pvp(Session *s, dumb_ptr<map_session_data> sd, if (chan < 1) { sd->state.pvpchannel = 1; - clif_displaymessage(s, "PvP : ##3##BOn"_s); + clif_displaymessage(s, "Server : ##3##BPvP ##3##BOn"_s); } else { sd->state.pvpchannel = 0; - clif_displaymessage(s, "PvP : ##3##BOff"_s); + clif_displaymessage(s, "Server : ##3##BPvP ##3##BOff"_s); } sd->state.pvp_rank = 0; diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp index 83b6f24..54f6c01 100644 --- a/src/map/script-call.cpp +++ b/src/map/script-call.cpp @@ -583,9 +583,8 @@ void run_func(ScriptState *st) start_sp--; if (start_sp == 0) { - if (battle_config.error_log) - PRINTF("function not found\n"_fmt); - st->state = ScriptEndState::END; + dumb_ptr<npc_data> nd = map_id_is_npc(st->oid); + PRINTF("run_func: function not found! @ %s\n"_fmt, nd ? nd->name : NpcName()); abort(); } } @@ -596,8 +595,9 @@ void run_func(ScriptState *st) if (!st->stack->stack_datav[st->start].is<ScriptDataFuncRef>()) { - PRINTF("run_func: not function and command! \n"_fmt); - st->state = ScriptEndState::END; + dumb_ptr<npc_data> nd = map_id_is_npc(st->oid); + PRINTF("run_func: not a function or statement! @ %s\n"_fmt, + nd ? nd->name : NpcName()); abort(); } size_t func = st->stack->stack_datav[st->start].get_if<ScriptDataFuncRef>()->numi; @@ -665,8 +665,9 @@ void run_func(ScriptState *st) if (st->defsp < 4 || !st->stack->stack_datav[st->defsp - 1].is<ScriptDataRetInfo>()) { - PRINTF("script:run_func (return) return without callfunc or callsub!\n"_fmt); - st->state = ScriptEndState::END; + 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 @@ -761,8 +762,9 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript) st->state = ScriptEndState::ZERO; if (st->freeloop != 1 && gotocount > 0 && (--gotocount) <= 0) { - PRINTF("run_script: infinity loop !\n"_fmt); - st->state = ScriptEndState::END; + dumb_ptr<npc_data> nd = map_id_is_npc(st->oid); + PRINTF("run_script: infinity loop! @ %s\n"_fmt, + nd ? nd->name : NpcName()); abort(); } } @@ -819,12 +821,12 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript) } } abort(); - break; } if (st->freeloop != 1 && cmdcount > 0 && (--cmdcount) <= 0) { - PRINTF("run_script: infinity loop !\n"_fmt); - st->state = ScriptEndState::END; + dumb_ptr<npc_data> nd = map_id_is_npc(st->oid); + PRINTF("run_script: infinity loop! @ %s\n"_fmt, + nd ? nd->name : NpcName()); abort(); } } |