Browse Source

Fixed some constants

[email protected] 16 years ago
parent
commit
d22d268c92
3 changed files with 11 additions and 8 deletions
  1. 1 1
      configure.in
  2. 1 1
      src/modules/filesystem/File.cpp
  3. 9 6
      src/modules/graphics/opengl/wrap_Graphics.cpp

+ 1 - 1
configure.in

@@ -1,4 +1,4 @@
-AC_INIT([love], [20090906-6a275e4b909a])
+AC_INIT([love], [20091011-ae1750d78436])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([platform/unix])
 AC_CONFIG_MACRO_DIR([platform/unix/m4])

+ 1 - 1
src/modules/filesystem/File.cpp

@@ -43,7 +43,7 @@ namespace filesystem
 		{"c", File::CLOSED},
 		{"r", File::READ},
 		{"w", File::WRITE},
-		{"w+", File::APPEND},
+		{"a", File::APPEND},
 	};
 
 	StringMap<File::Mode, File::MODE_MAX_ENUM> File::modes(File::modeEntries, sizeof(File::modeEntries));

+ 9 - 6
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -383,8 +383,8 @@ namespace opengl
 	int w_getBlendMode(lua_State * L)
 	{
 		Graphics::BlendMode mode = instance->getBlendMode();
-		const char * str = luaL_checkstring(L, 1);
-		if(!Graphics::getConstant(str, mode))
+		const char * str;
+		if(!Graphics::getConstant(mode, str))
 			return luaL_error(L, "Invalid blend mode: %s", str);
 
 		lua_pushstring(L, str);
@@ -394,9 +394,9 @@ namespace opengl
 	int w_getColorMode(lua_State * L)
 	{
 		Graphics::ColorMode mode = instance->getColorMode();
-		const char * str = luaL_checkstring(L, 1);
-		if(!Graphics::getConstant(str, mode))
-			return luaL_error(L, "Invalid blend mode: %s", str);
+		const char * str;
+		if(!Graphics::getConstant(mode, str))
+			return luaL_error(L, "Invalid color mode: %s", str);
 
 		lua_pushstring(L, str);
 		return 1;
@@ -459,7 +459,10 @@ namespace opengl
 
 	int w_getLineStyle(lua_State * L)
 	{
-		lua_pushinteger(L, instance->getLineStyle());
+		Graphics::LineStyle style = instance->getLineStyle();
+		const char *str;
+		Graphics::getConstant(style, str);
+		lua_pushstring(L, str);
 		return 1;
 	}