2 files changed, 53 insertions, 56 deletions

diff --git a/src/script/graphics/luaopen_JSL.cpp b/src/script/graphics/luaopen_JSL.cpp
index adb109c..d5db363 100644
--- a/src/script/graphics/luaopen_JSL.cpp
+++ b/src/script/graphics/luaopen_JSL.cpp
@@ -24,22 +24,22 @@ namespace lua
         NUMBER,
         IMAGE,
         CANVAS,
-		VEC2,
-		VEC3,
-		VEC4, 
-		COLOR,
+        VEC2,
+        VEC3,
+        VEC4, 
+        COLOR,
     };
 
     static VARIABLE_TYPE strtotype(const char* str)
     {
         std::string s = std::string(str);
-        if		(s == "number") return NUMBER;
+        if        (s == "number") return NUMBER;
         else if (s == "Image")  return IMAGE;
         else if (s == "Canvas") return CANVAS;
-		else if (s == "vec2")   return VEC2;
-		else if (s == "vec3")   return VEC3;
-		else if (s == "vec4")   return VEC4;
-		else if (s == "Color")  return COLOR;
+        else if (s == "vec2")   return VEC2;
+        else if (s == "vec3")   return VEC3;
+        else if (s == "vec4")   return VEC4;
+        else if (s == "Color")  return COLOR;
         else return INVALID;
     }
 
@@ -72,48 +72,48 @@ namespace lua
                 break;
             }
             case CANVAS:
-			{
+            {
                 Proxy* proxy = (Proxy*)luax_checktype(L, 4, TYPE_IMAGE);
                 Canvas* canvas = (Canvas*)proxy->object;
-				jsl->sendCanvas(variable, canvas);
-				break;
-			}
-			case VEC2:
-			{
-				float x = luax_checknumber(L, 4);
-				float y = luax_checknumber(L, 5);
-				jsl->sendVec2(variable, x, y);
-				break;
-			}
-			case VEC3:
-			{
-				float x = luax_checknumber(L, 4);
-				float y = luax_checknumber(L, 5);
-				float z = luax_checknumber(L, 6);
-				jsl->sendVec3(variable, x, y, z);
-				break;
-			}
-			case VEC4:
-			{
-				float x = luax_checknumber(L, 4);
-				float y = luax_checknumber(L, 5);
-				float z = luax_checknumber(L, 6);
-				float w = luax_checknumber(L, 7);
-				jsl->sendVec4(variable, x, y, z, w);
-				break;
-			}
-			case COLOR:
-			{
-				color col;
-				col.rgba.r = luax_checkinteger(L, 4);
-				col.rgba.g = luax_checkinteger(L, 5);
-				col.rgba.b = luax_checkinteger(L, 6);
-				col.rgba.a = luax_checkinteger(L, 7);
-				jsl->sendColor(variable, &col);
-				break;
-			}
-			default:
-				return 0;
+                jsl->sendCanvas(variable, canvas);
+                break;
+            }
+            case VEC2:
+            {
+                float x = luax_checknumber(L, 4);
+                float y = luax_checknumber(L, 5);
+                jsl->sendVec2(variable, x, y);
+                break;
+            }
+            case VEC3:
+            {
+                float x = luax_checknumber(L, 4);
+                float y = luax_checknumber(L, 5);
+                float z = luax_checknumber(L, 6);
+                jsl->sendVec3(variable, x, y, z);
+                break;
+            }
+            case VEC4:
+            {
+                float x = luax_checknumber(L, 4);
+                float y = luax_checknumber(L, 5);
+                float z = luax_checknumber(L, 6);
+                float w = luax_checknumber(L, 7);
+                jsl->sendVec4(variable, x, y, z, w);
+                break;
+            }
+            case COLOR:
+            {
+                color col;
+                col.rgba.r = luax_checkinteger(L, 4);
+                col.rgba.g = luax_checkinteger(L, 5);
+                col.rgba.b = luax_checkinteger(L, 6);
+                col.rgba.a = luax_checkinteger(L, 7);
+                jsl->sendColor(variable, &col);
+                break;
+            }
+            default:
+                return 0;
             }
         }
         return 1; 
diff --git a/src/script/graphics/luaopen_graphics.cpp b/src/script/graphics/luaopen_graphics.cpp
index 6e78e36..948e28a 100644
--- a/src/script/graphics/luaopen_graphics.cpp
+++ b/src/script/graphics/luaopen_graphics.cpp
@@ -30,15 +30,12 @@ namespace lua
     static int l_init(lua_State* L)
     {
         Window* wnd = Window::get();
-        Window::Setting setting;
+        WindowSetting setting;
         setting.width  = luax_getfield_integer(L, 1, "width"); 
         setting.height = luax_getfield_integer(L, 1, "height");
         setting.title  = luax_getfield_string(L, 1, "title");
         setting.vsync  = luax_getfield_bool(L, 1, "vsync");
-        wnd->init(setting);
-
-        // init success 
-        luax_pushboolean(L, true);
+        luax_pushboolean(L, wnd->init(&setting));
         return 1;
     }
     
@@ -357,8 +354,8 @@ namespace lua
             int tn = luax_tableidxlen(L, 3);
             if (tn != n * 2)
             {
-                static char emsg[] = 
-                "number of polygon vertices doesn't match "
+                static char* emsg = \
+                "number of polygon vertices doesn't match " \
                 "provided n, expect %d numbers but get %d";
                 luax_error(L, emsg, n * 2, tn);
                 return 1;