aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-31 08:33:22 +0800
committerchai <chaifix@163.com>2018-10-31 08:33:22 +0800
commita6868deda1af419822d1610c0ca8b81413519393 (patch)
tree7868c70ad6e79b8e8705381489c729e48663c570 /src
parent3d664c69fd558730eba34bed24ca42a6a8559f9f (diff)
*更新错误处理
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/buildvm/buildvm.exebin62976 -> 62976 bytes
-rw-r--r--src/3rdparty/minilua/minilua.exebin112640 -> 112640 bytes
-rw-r--r--src/lua/common/je_lua_error.h5
-rw-r--r--src/lua/modules/graphics/je_lua_graphics.cpp4
4 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe
index 542418c..2fbe5b0 100644
--- a/src/3rdparty/buildvm/buildvm.exe
+++ b/src/3rdparty/buildvm/buildvm.exe
Binary files differ
diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe
index 538cc53..c4a2ff5 100644
--- a/src/3rdparty/minilua/minilua.exe
+++ b/src/3rdparty/minilua/minilua.exe
Binary files differ
diff --git a/src/lua/common/je_lua_error.h b/src/lua/common/je_lua_error.h
index 500994f..3f7e76f 100644
--- a/src/lua/common/je_lua_error.h
+++ b/src/lua/common/je_lua_error.h
@@ -17,8 +17,9 @@ namespace JinEngine
va_start(args, fmt);
vsnprintf(err + strlen(err), FORMAT_MSG_BUFFER_SIZE, fmt, args);
va_end(args);
- luax_getglobal(L, "jin");
- luax_setfieldstring(L, "error", err);
+ //luax_getglobal(L, "jin");
+ //luax_setfieldstring(L, "error", err);
+ luax_error(L, err);
}
} // namespace Lua
diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index 90e4533..a2157b6 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -196,7 +196,7 @@ namespace JinEngine
AssetDatabase* fs = AssetDatabase::get();
if (!fs->exists(path))
{
- error(L, "No such shader file %s\n", path);
+ error(L, "No such shader file \"%s\"\n", path);
luax_pushnil(L);
return 1;
}
@@ -809,4 +809,4 @@ namespace JinEngine
}
} // namespace Lua
-} // namespace JinEngine \ No newline at end of file
+} // namespace JinEngine \ No newline at end of file