Merge branch 'master' of http://git.aasimon.org/public/pracro

1 files changed, 7 insertions, 3 deletions

diff --git a/client/luapraxisd.cc b/client/luapraxisd.cc
index 11d619e..00ed961 100644
--- a/client/luapraxisd.cc
+++ b/client/luapraxisd.cc
@@ -72,7 +72,9 @@ static int px_getcave(lua_State *L)
   int top = lua_gettop(L);
 
   for(int i = 0; i < cavelist.size(); i++) {
-    lua_pushstring(L,  QString::fromUtf8(cavelist[i].toStdString().c_str()).toStdString().c_str());
+    QString c = cavelist[i];
+    DEBUG(cavelist, "CAVE '%s'\n", c.toStdString().c_str());
+    lua_pushstring(L, c.toStdString().c_str());
     lua_rawseti(L, top, i);
   }
 
@@ -85,7 +87,7 @@ static int px_cavelist(lua_State *L)
   pxu = (px_userdata *)luaL_checkudata(L, 1, "Praxisd");
   luaL_argcheck(L, pxu, 1, "Praxisd expected");
 
-  QVector<cave_t> cavelist = pxu->px->diverse_get_cave("");
+  QVector<cave_t> cavelist = pxu->px->diverse_get_cave("C");
   if(pxu->px->hasError()) {
     lua_pushstring(L, pxu->px->errorString().toStdString().c_str());
     lua_error(L);
@@ -96,7 +98,9 @@ static int px_cavelist(lua_State *L)
   int top = lua_gettop(L);
 
   for(size_t i = 0; i < (size_t)cavelist.size(); i++) {
-    lua_pushstring(L, QString::fromUtf8(cavelist[i].cave.toStdString().c_str()).toStdString().c_str());
+    QString c = cavelist[i].cave;
+    DEBUG(cavelist, "CAVE '%s'\n", c.toStdString().c_str());
+    lua_pushstring(L, c.toStdString().c_str());
     lua_rawseti(L, top, i);
   }