From c703bc2fd7823c170ec5c40e7f89b40b8c6b2c80 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 6 Aug 2018 22:37:44 +0100
Subject: [PATCH] Trim off any extra null bytes off the end of sector
floorpic/ceiling when you access them in Lua
---
src/lua_maplib.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 208aebe379..4e9dbd5afb 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -327,6 +327,7 @@ static int sector_get(lua_State *L)
{
sector_t *sector = *((sector_t **)luaL_checkudata(L, 1, META_SECTOR));
enum sector_e field = luaL_checkoption(L, 2, sector_opt[0], sector_opt);
+ INT16 i;
if (!sector)
{
@@ -349,11 +350,23 @@ static int sector_get(lua_State *L)
lua_pushfixed(L, sector->ceilingheight);
return 1;
case sector_floorpic: // floorpic
- lua_pushlstring(L, levelflats[sector->floorpic].name, 8);
+ {
+ levelflat_t *levelflat = &levelflats[sector->floorpic];
+ for (i = 0; i < 8; i++)
+ if (!levelflat->name[i])
+ break;
+ lua_pushlstring(L, levelflat->name, i);
return 1;
+ }
case sector_ceilingpic: // ceilingpic
- lua_pushlstring(L, levelflats[sector->ceilingpic].name, 8);
+ {
+ levelflat_t *levelflat = &levelflats[sector->ceilingpic];
+ for (i = 0; i < 8; i++)
+ if (!levelflat->name[i])
+ break;
+ lua_pushlstring(L, levelflat->name, i);
return 1;
+ }
case sector_lightlevel:
lua_pushinteger(L, sector->lightlevel);
return 1;
--
GitLab