From 6fc0f5f1c1704664e178430056376981520744b4 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 23 Jun 2014 21:44:50 -0700
Subject: Swat

---
 src/map/npc.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/map/npc.cpp')

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