Browse Source

newThread now accepts files

Bart van Strien 15 years ago
parent
commit
48a94f32d9
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/modules/thread/sdl/wrap_Thread.cpp

+ 6 - 2
src/modules/thread/sdl/wrap_Thread.cpp

@@ -256,9 +256,13 @@ namespace sdl
 	int w_newThread(lua_State *L)
 	int w_newThread(lua_State *L)
 	{
 	{
 		std::string name = luaL_checkstring(L, 1);
 		std::string name = luaL_checkstring(L, 1);
+		love::Data *data;
 		if (lua_isstring(L, 2))
 		if (lua_isstring(L, 2))
-			luax_convobj(L, 2, "filesystem", "read");
-		love::Data *data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
+			luax_convobj(L, 2, "filesystem", "newFile");
+		if (luax_istype(L, 2, FILESYSTEM_FILE_T))
+			data = luax_checktype<love::filesystem::File>(L, 2, "File", FILESYSTEM_FILE_T)->read();
+		else
+			data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
 		Thread *t = instance->newThread(name, data);
 		Thread *t = instance->newThread(name, data);
 		luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
 		luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
 		return 1;
 		return 1;