vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'lua-fof-flat-names-fix' into 'next' 

Lua FOF flat names fix

See merge request STJr/SRB2!405
This commit is contained in:
Monster Iestyn 2018-12-20 15:48:04 -05:00
parent dfbbab35f4 76fe78571e
commit c9a730340a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lua_maplib.c
View File

@ -1090,6 +1090,7 @@ static int ffloor_get(lua_State *L)
{ {
ffloor_t *ffloor = *((ffloor_t **)luaL_checkudata(L, 1, META_FFLOOR)); ffloor_t *ffloor = *((ffloor_t **)luaL_checkudata(L, 1, META_FFLOOR));
enum ffloor_e field = luaL_checkoption(L, 2, ffloor_opt[0], ffloor_opt); enum ffloor_e field = luaL_checkoption(L, 2, ffloor_opt[0], ffloor_opt);
INT16 i;
if (!ffloor) if (!ffloor)
{ {
@ -1109,11 +1110,11 @@ static int ffloor_get(lua_State *L)
lua_pushfixed(L, *ffloor->topheight); lua_pushfixed(L, *ffloor->topheight);
return 1; return 1;
case ffloor_toppic: { // toppic case ffloor_toppic: { // toppic
levelflat_t *levelflat; levelflat_t *levelflat = &levelflats[*ffloor->toppic];
INT16 i; for (i = 0; i < 8; i++)
for (i = 0, levelflat = levelflats; i != *ffloor->toppic; i++, levelflat++) if (!levelflat->name[i])
; break;
lua_pushlstring(L, levelflat->name, 8); lua_pushlstring(L, levelflat->name, i);
return 1; return 1;
} }
case ffloor_toplightlevel: case ffloor_toplightlevel:
@ -1123,11 +1124,11 @@ static int ffloor_get(lua_State *L)
lua_pushfixed(L, *ffloor->bottomheight); lua_pushfixed(L, *ffloor->bottomheight);
return 1; return 1;
case ffloor_bottompic: { // bottompic case ffloor_bottompic: { // bottompic
levelflat_t *levelflat; levelflat_t *levelflat = &levelflats[*ffloor->bottompic];
INT16 i; for (i = 0; i < 8; i++)
for (i = 0, levelflat = levelflats; i != *ffloor->bottompic; i++, levelflat++) if (!levelflat->name[i])
; break;
lua_pushlstring(L, levelflat->name, 8); lua_pushlstring(L, levelflat->name, i);
return 1; return 1;
} }
#ifdef ESLOPE #ifdef ESLOPE