diff options
Diffstat (limited to 'src/lua/modules/graphics')
-rw-r--r-- | src/lua/modules/graphics/je_lua_animation.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_animator.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_canvas.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 9 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_page.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_shader.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_sprite.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_spritesheet.cpp | 8 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_text.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_texture.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_texture_font.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_ttf.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_ttf_data.cpp | 1 |
13 files changed, 8 insertions, 20 deletions
diff --git a/src/lua/modules/graphics/je_lua_animation.cpp b/src/lua/modules/graphics/je_lua_animation.cpp index d054761..cd048e3 100644 --- a/src/lua/modules/graphics/je_lua_animation.cpp +++ b/src/lua/modules/graphics/je_lua_animation.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_animator.cpp b/src/lua/modules/graphics/je_lua_animator.cpp index 857d375..843204d 100644 --- a/src/lua/modules/graphics/je_lua_animator.cpp +++ b/src/lua/modules/graphics/je_lua_animator.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_canvas.cpp b/src/lua/modules/graphics/je_lua_canvas.cpp index 5cbcf98..80ee155 100644 --- a/src/lua/modules/graphics/je_lua_canvas.cpp +++ b/src/lua/modules/graphics/je_lua_canvas.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_canvas.h" diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index cc67055..82793be 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -3,7 +3,6 @@ #include "libjin/jin.h" #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "je_lua_canvas.h" @@ -794,9 +793,9 @@ namespace JinEngine // newAnimation([frames table, loop, speed]) LUA_IMPLEMENT int l_newAnimation(lua_State* L) { - int args = luax_gettop(L); + int argc = luax_gettop(L); Shared<Animation>* shrAnimation = new Shared<Animation>(new Animation(), Jin_Lua_Animation); - if (args >= 3) + if (argc >= 3) { if (!luax_istable(L, 1)) { @@ -825,9 +824,9 @@ namespace JinEngine // newAnimator([animation]) LUA_IMPLEMENT int l_newAnimator(lua_State* L) { - int args = luax_gettop(L); + int argc = luax_gettop(L); Shared<Animator>* shrAniamtor = new Shared<Animator>(new Animator(), Jin_Lua_Animator); - if (args >= 1) + if (argc >= 1) { Proxy* pxyAnimation = (Proxy*)luax_checktype(L, 1, Jin_Lua_Animation); Shared<Animation>& shrAnimtion = pxyAnimation->getShared<Animation>(); diff --git a/src/lua/modules/graphics/je_lua_page.cpp b/src/lua/modules/graphics/je_lua_page.cpp index c3fdc7e..c119991 100644 --- a/src/lua/modules/graphics/je_lua_page.cpp +++ b/src/lua/modules/graphics/je_lua_page.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_shader.cpp b/src/lua/modules/graphics/je_lua_shader.cpp index cfe2260..ca4d6f6 100644 --- a/src/lua/modules/graphics/je_lua_shader.cpp +++ b/src/lua/modules/graphics/je_lua_shader.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_sprite.cpp b/src/lua/modules/graphics/je_lua_sprite.cpp index 01ba103..018a43d 100644 --- a/src/lua/modules/graphics/je_lua_sprite.cpp +++ b/src/lua/modules/graphics/je_lua_sprite.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_spritesheet.cpp b/src/lua/modules/graphics/je_lua_spritesheet.cpp index 57b610c..362a78d 100644 --- a/src/lua/modules/graphics/je_lua_spritesheet.cpp +++ b/src/lua/modules/graphics/je_lua_spritesheet.cpp @@ -66,12 +66,12 @@ namespace JinEngine int w = luax_checkinteger(L, 5); int h = luax_checkinteger(L, 6); vector<Sprite*> sprs; - int args = luax_gettop(L); - if (args == 6) + int argc = luax_gettop(L); + if (argc == 6) { sprs = ss->createSprites(count, r, c, w, h, Origin::TopLeft); } - else if (args >= 8) + else if (argc >= 8) { int ox = luax_checkinteger(L, 7); int oy = luax_checkinteger(L, 8); @@ -79,7 +79,7 @@ namespace JinEngine int offy = luax_optinteger(L, 10, 0); sprs = ss->createSprites(count, r, c, w, h, ox, oy, offx, offy); } - else if (args >= 7) + else if (argc >= 7) { int o = luax_checkinteger(L, 7); Origin origin = static_cast<Origin>(o); diff --git a/src/lua/modules/graphics/je_lua_text.cpp b/src/lua/modules/graphics/je_lua_text.cpp index 6509e73..adeed35 100644 --- a/src/lua/modules/graphics/je_lua_text.cpp +++ b/src/lua/modules/graphics/je_lua_text.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_texture.cpp b/src/lua/modules/graphics/je_lua_texture.cpp index 5402a99..a8676f1 100644 --- a/src/lua/modules/graphics/je_lua_texture.cpp +++ b/src/lua/modules/graphics/je_lua_texture.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_texture.h" diff --git a/src/lua/modules/graphics/je_lua_texture_font.cpp b/src/lua/modules/graphics/je_lua_texture_font.cpp index 61c559b..6c62ee2 100644 --- a/src/lua/modules/graphics/je_lua_texture_font.cpp +++ b/src/lua/modules/graphics/je_lua_texture_font.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_ttf.cpp b/src/lua/modules/graphics/je_lua_ttf.cpp index 7fea04b..fb4b0df 100644 --- a/src/lua/modules/graphics/je_lua_ttf.cpp +++ b/src/lua/modules/graphics/je_lua_ttf.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" diff --git a/src/lua/modules/graphics/je_lua_ttf_data.cpp b/src/lua/modules/graphics/je_lua_ttf_data.cpp index aa2280f..8042d69 100644 --- a/src/lua/modules/graphics/je_lua_ttf_data.cpp +++ b/src/lua/modules/graphics/je_lua_ttf_data.cpp @@ -1,5 +1,4 @@ #include "common/je_lua_proxy.h" - #include "common/je_lua_common.h" #include "libjin/jin.h" |