From 40fc27154fe754181934dc7ee31375e6bdfb33fc Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 23 Oct 2018 12:23:58 +0800
Subject: *merge from minimal

---
 src/lua/modules/joypad/joypad.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/lua/modules/joypad/joypad.cpp')

diff --git a/src/lua/modules/joypad/joypad.cpp b/src/lua/modules/joypad/joypad.cpp
index d305878..d67a624 100644
--- a/src/lua/modules/joypad/joypad.cpp
+++ b/src/lua/modules/joypad/joypad.cpp
@@ -1,21 +1,21 @@
 #include "libjin/jin.h"
 #include "lua/modules/luax.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{
-
-    static const luaL_Reg f[] = {
-        { 0, 0 }
-    };
-
-    int luaopen_joypad(lua_State* L)
+    namespace Lua
     {
-        luax_newlib(L, f);
 
-        return 1;
-    }
+        static const luaL_Reg f[] = {
+            { 0, 0 }
+        };
+
+        int luaopen_joypad(lua_State* L)
+        {
+            luax_newlib(L, f);
 
-}
-}
\ No newline at end of file
+            return 1;
+        }
+        /*SDL_JoystickGetButton*/
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file
-- 
cgit v1.1-26-g67d0