aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-05-17 21:34:01 +0800
committerchai <chaifix@163.com>2018-05-17 21:34:01 +0800
commitb293e9e2242c08c15e1a3248c6dec301e83652d4 (patch)
tree491ac9dec2cf8ad9dfb2a0ea375da62cb86d0373 /src
parent38818e2abc0fb4e8f71f2c262f10ef5cb7fc4710 (diff)
change file tree
Diffstat (limited to 'src')
-rw-r--r--src/data/font.ttf (renamed from src/res/font.ttf)bin84564 -> 84564 bytes
-rw-r--r--src/data/font.ttf.h (renamed from src/res/font.ttf.h)0
-rw-r--r--src/data/icon.png (renamed from src/res/icon.png)bin773 -> 773 bytes
-rw-r--r--src/data/icon.png.h (renamed from src/res/icon.png.h)0
-rw-r--r--src/script/graphics/luaopen_graphics.cpp2
-rw-r--r--src/script/luaopen_jin.cpp4
6 files changed, 2 insertions, 4 deletions
diff --git a/src/res/font.ttf b/src/data/font.ttf
index 153c608..153c608 100644
--- a/src/res/font.ttf
+++ b/src/data/font.ttf
Binary files differ
diff --git a/src/res/font.ttf.h b/src/data/font.ttf.h
index 519d723..519d723 100644
--- a/src/res/font.ttf.h
+++ b/src/data/font.ttf.h
diff --git a/src/res/icon.png b/src/data/icon.png
index 94eeb9f..94eeb9f 100644
--- a/src/res/icon.png
+++ b/src/data/icon.png
Binary files differ
diff --git a/src/res/icon.png.h b/src/data/icon.png.h
index e69de29..e69de29 100644
--- a/src/res/icon.png.h
+++ b/src/data/icon.png.h
diff --git a/src/script/graphics/luaopen_graphics.cpp b/src/script/graphics/luaopen_graphics.cpp
index 71637a9..4f61023 100644
--- a/src/script/graphics/luaopen_graphics.cpp
+++ b/src/script/graphics/luaopen_graphics.cpp
@@ -422,7 +422,7 @@ namespace lua
{
if (context.defaultFont == 0)
{
- #include "res/font.ttf.h"
+ #include "data/font.ttf.h"
// load default font
context.defaultFont = new Font();
context.defaultFont->loadb(font_ttf);
diff --git a/src/script/luaopen_jin.cpp b/src/script/luaopen_jin.cpp
index c4ee955..d7262e1 100644
--- a/src/script/luaopen_jin.cpp
+++ b/src/script/luaopen_jin.cpp
@@ -8,9 +8,7 @@ namespace jin
{
namespace lua
{
- /**
- * sub modules
- */
+
extern int luaopen_core(lua_State* L);
extern int luaopen_graphics(lua_State* L);
extern int luaopen_audio(lua_State* L);