thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'displayPlayersIterateFix' into 'master'

Browse source 
Fix displayplayers.iterate hang when multiple viewports view the same player

See merge request KartKrew/RingRacers!127
This commit is contained in:
Eidolon 2025-08-19 00:20:16 +00:00
commit c89b643af8
1 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/lua_playerlib.c
View file

@ -97,44 +97,29 @@ static int lib_lenPlayer(lua_State *L)
static int lib_iterateDisplayplayers(lua_State *L) static int lib_iterateDisplayplayers(lua_State *L)
{ {
INT32 i = -1; INT32 i = lua_tonumber(L, lua_upvalueindex(1));
INT32 temp = -1;
INT32 iter = 0;
if (lua_gettop(L) < 2) if (lua_gettop(L) < 2)
{ {
//return luaL_error(L, "Don't call displayplayers.iterate() directly, use it as 'for player in displayplayers.iterate do <block> end'."); lua_pushcclosure(L, lib_iterateDisplayplayers, 1);
lua_pushcfunction(L, lib_iterateDisplayplayers);
return 1; return 1;
} }
lua_settop(L, 2);
lua_remove(L, 1); // state is unused. if (i <= r_splitscreen)
if (!lua_isnil(L, 1))
{ {
temp = (INT32)(*((player_t **)luaL_checkudata(L, 1, META_PLAYER)) - players); // get the player # of the last iterated player. if (!playeringame[displayplayers[i]])
return 0;
// @FIXME:
// I didn't quite find a better way for this; Here, we go back to which player in displayplayers we last iterated to resume the for loop below for this new function call // Return player and splitscreen index.
// I don't understand enough about how the Lua stacks work to get this to work in possibly a single line.
// So anyone feel free to correct this!
for (; iter < MAXSPLITSCREENPLAYERS; iter++)
{
if (displayplayers[iter] == temp)
{
i = iter;
break;
}
}
}
for (i++; i < MAXSPLITSCREENPLAYERS; i++)
{
if (i > r_splitscreen || !playeringame[displayplayers[i]])
return 0; // Stop! There are no more players for us to go through. There will never be a player gap in displayplayers.
LUA_PushUserdata(L, &players[displayplayers[i]], META_PLAYER); LUA_PushUserdata(L, &players[displayplayers[i]], META_PLAYER);
lua_pushinteger(L, i); // push this to recall what number we were on for the next function call. I suppose this also means you can retrieve the splitscreen player number with 'for p, n in displayplayers.iterate'! lua_pushnumber(L, i);
// Update splitscreen index value for next iteration.
lua_pushnumber(L, i + 1);
lua_pushvalue(L, -1);
lua_replace(L, lua_upvalueindex(1));
lua_pop(L, 1);
return 2; return 2;
} }
return 0; return 0;
@ -160,7 +145,7 @@ static int lib_getDisplayplayers(lua_State *L)
field = luaL_checkstring(L, 2); field = luaL_checkstring(L, 2);
if (fastcmp(field,"iterate")) if (fastcmp(field,"iterate"))
{ {
lua_pushcfunction(L, lib_iterateDisplayplayers); lua_pushcclosure(L, lib_iterateDisplayplayers, 1);
return 1; return 1;
} }
return 0; return 0;