LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 11:44:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge (the hardest merge evahr, thanks rude)

Browse Source
This commit is contained in:
bart@bartbes.ath.cx
2010-02-25 20:13:50 +01:00
parent 051f6f6eaa 16bf591c96
commit dbf8301f24
6 changed files with 102 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/sdl/wrap_Thread.cpp
+5 -3
View File
@@ -201,7 +201,7 @@ namespace sdl
ThreadVariant *v;
if (lua_isboolean(L, 3))
{
v = new ThreadVariant((bool) lua_toboolean(L, 3));
v = new ThreadVariant(luax_toboolean(L, 3));
}
else if (lua_isnumber(L, 3))
{
@@ -260,9 +260,11 @@ namespace sdl
int w_getThreads(lua_State *L)
{
Thread **list = instance->getThreads();
unsigned count = instance->getThreadCount();
Thread **list = new Thread*[count];
instance->getThreads(list);
lua_newtable(L);
for (int i = 0; list[i] != 0; i++)
for (unsigned int i = 0; i<count; i++)
{
luax_newtype(L, "Thread", THREAD_THREAD_T, (void*) list[i]);
list[i]->lock();