From 6fc0f5f1c1704664e178430056376981520744b4 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 23 Jun 2014 21:44:50 -0700 Subject: Swat --- src/map/chrif.cpp | 4 +--- src/map/npc.cpp | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/map') diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index 2998516..3e20c3f 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -1249,8 +1249,6 @@ void chrif_parse(Session *s) static void send_users_tochar(TimerData *, tick_t) { - int users = 0; - if (!char_session) return; @@ -1272,7 +1270,7 @@ void send_users_tochar(TimerData *, tick_t) repeat_ff.push_back(info); } } - head_ff.users = users; + head_ff.users = repeat_ff.size(); send_vpacket<0x2aff, 6, 4>(char_session, head_ff, repeat_ff); } diff --git a/src/map/npc.cpp b/src/map/npc.cpp index ef10d82..7b31729 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -1303,7 +1303,10 @@ int npc_parse_script(XString w1, XString w2, NpcName w3, ZString w4, } else { - if (!extract(w4, &npc_class)) + XString w4x = w4; + if (w4x.endswith(',')) + w4x = w4x.xrslice_h(1); + if (!extract(w4x, &npc_class)) abort(); nd->scr.xs = 0; nd->scr.ys = 0; -- cgit v1.2.3-60-g2f50