Browse Source

Format luaL_error strings properly in ShaderEffect lua wrapper code

Alexander Szpakowski 12 years ago
parent
commit
609ef2c4e4

+ 5 - 5
src/modules/graphics/opengl/wrap_ShaderEffect.cpp

@@ -63,7 +63,7 @@ static int _sendScalars(lua_State *L, ShaderEffect *effect, const char *name, in
 	catch(love::Exception &e)
 	catch(love::Exception &e)
 	{
 	{
 		delete[] values;
 		delete[] values;
-		return luaL_error(L, e.what());
+		return luaL_error(L, "%s", e.what());
 	}
 	}
 
 
 	delete[] values;
 	delete[] values;
@@ -104,7 +104,7 @@ static int _sendVectors(lua_State *L, ShaderEffect *effect, const char *name, in
 	catch(love::Exception &e)
 	catch(love::Exception &e)
 	{
 	{
 		delete[] values;
 		delete[] values;
-		return luaL_error(L, e.what());
+		return luaL_error(L, "%s", e.what());
 	}
 	}
 
 
 	delete[] values;
 	delete[] values;
@@ -178,7 +178,7 @@ int w_ShaderEffect_sendMatrix(lua_State *L)
 	catch(love::Exception &e)
 	catch(love::Exception &e)
 	{
 	{
 		delete[] values;
 		delete[] values;
-		return luaL_error(L, e.what());
+		return luaL_error(L, "%s", e.what());
 	}
 	}
 
 
 	delete[] values;
 	delete[] values;
@@ -197,7 +197,7 @@ int w_ShaderEffect_sendImage(lua_State *L)
 	}
 	}
 	catch(love::Exception &e)
 	catch(love::Exception &e)
 	{
 	{
-		luaL_error(L, e.what());
+		luaL_error(L, "%s", e.what());
 	}
 	}
 
 
 	return 0;
 	return 0;
@@ -215,7 +215,7 @@ int w_ShaderEffect_sendCanvas(lua_State *L)
 	}
 	}
 	catch(love::Exception &e)
 	catch(love::Exception &e)
 	{
 	{
-		luaL_error(L, e.what());
+		luaL_error(L, "%s", e.what());
 	}
 	}
 
 
 	return 0;
 	return 0;

+ 2 - 0
src/scripts/graphics.lua

@@ -1284,6 +1284,8 @@ do
 	end
 	end
 
 
 
 
+	-- SHADER EFFECTS
+
 	local GLSL_VERSION = "#version 120"
 	local GLSL_VERSION = "#version 120"
 
 
 	local GLSL_VERT = {
 	local GLSL_VERT = {

+ 1 - 0
src/scripts/graphics.lua.h

@@ -6259,6 +6259,7 @@ const unsigned char graphics_lua[] =
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72, 
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72, 
 	0x69, 0x6e, 0x74, 0x66, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x0a,
 	0x69, 0x6e, 0x74, 0x66, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x2d, 0x2d, 0x20, 0x53, 0x48, 0x41, 0x44, 0x45, 0x52, 0x20, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 
 	0x4e, 0x20, 0x3d, 0x20, 0x22, 0x23, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x32, 0x30, 0x22, 0x0a,
 	0x4e, 0x20, 0x3d, 0x20, 0x22, 0x23, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x32, 0x30, 0x22, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x56, 0x45, 0x52, 0x54, 0x20, 0x3d, 
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x56, 0x45, 0x52, 0x54, 0x20, 0x3d,