Fix the lua kills report for monsters with non-ascii glyphs.

1 files changed, 10 insertions, 8 deletions

diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc
index 3e7e179da5..9feaffd9e3 100644
--- a/crawl-ref/source/kills.cc
+++ b/crawl-ref/source/kills.cc
@@ -20,6 +20,7 @@
 #include "kills.h"
 #include "clua.h"
 #include "options.h"
+#include "viewchar.h"
 
 #define KILLS_MAJOR_VERSION 4
 #define KILLS_MINOR_VERSION 1
@@ -860,8 +861,8 @@ static int kill_lualc_symbol(lua_State *ls)
     kill_exp *ke = static_cast<kill_exp*>( lua_touserdata(ls, 1) );
     if (ke)
     {
-        unsigned char ch = ke->monnum != -1?
-                    mons_char(ke->monnum) :
+        wchar_t ch = ke->monnum != -1?
+                     mons_char(ke->monnum) :
               is_ghost(ke)? 'p' : '&';
 
         if (ke->monnum == MONS_PROGRAM_BUG)
@@ -871,20 +872,21 @@ static int kill_lualc_symbol(lua_State *ls)
         {
         case kill_monster_desc::M_ZOMBIE:
         case kill_monster_desc::M_SKELETON:
+            ch = mons_char(mons_zombie_size(ke->monnum) == Z_SMALL ?
+                           MONS_ZOMBIE_SMALL : MONS_ZOMBIE_LARGE);
+            break;
         case kill_monster_desc::M_SIMULACRUM:
-            ch = mons_zombie_size(ke->monnum) == Z_SMALL ? 'z' : 'Z';
+            ch = mons_char(mons_zombie_size(ke->monnum) == Z_SMALL ?
+                           MONS_SIMULACRUM_SMALL : MONS_SIMULACRUM_LARGE);
             break;
         case kill_monster_desc::M_SPECTRE:
-            ch = 'W';
+            ch = mons_char(MONS_SPECTRAL_THING);
             break;
         default:
             break;
         }
 
-        char s[2];
-        s[0] = (char) ch;
-        s[1] = 0;
-        lua_pushstring(ls, s);
+        lua_pushstring(ls, stringize_glyph(ch).c_str());
         return 1;
     }
     return 0;