diff options
| -rw-r--r-- | bin/Jin.exe | bin | 843776 -> 843264 bytes | |||
| -rw-r--r-- | bin/SDL2.dll | bin | 771072 -> 771072 bytes | |||
| -rw-r--r-- | build/vc++/jin.vcxproj | 2 | ||||
| -rw-r--r-- | src/3rdparty/buildvm/buildvm.exe | bin | 62976 -> 62976 bytes | |||
| -rw-r--r-- | src/3rdparty/minilua/minilua.exe | bin | 112640 -> 112640 bytes | |||
| -rw-r--r-- | src/lua/common/je_lua_error.h | 5 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 4 |
7 files changed, 6 insertions, 5 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex d5fd1f0..50e9e23 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/SDL2.dll b/bin/SDL2.dll Binary files differindex 758547a..cca85de 100644 --- a/bin/SDL2.dll +++ b/bin/SDL2.dll diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index 39f6381..666efe4 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -22,7 +22,7 @@ <ProjectGuid>{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}</ProjectGuid> <RootNamespace>jin</RootNamespace> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - <ProjectName>luaport</ProjectName> + <ProjectName>lua</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe Binary files differindex 542418c..2fbe5b0 100644 --- a/src/3rdparty/buildvm/buildvm.exe +++ b/src/3rdparty/buildvm/buildvm.exe diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe Binary files differindex 538cc53..c4a2ff5 100644 --- a/src/3rdparty/minilua/minilua.exe +++ b/src/3rdparty/minilua/minilua.exe 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 |