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

toptexture, bottomtexture, and midtexture use strings instead of magic numbers

Browse source
This commit is contained in:
TehRealSalt 2018-11-07 17:53:49 -05:00
parent c7b0df8172
commit cf61784f5f
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/lua_maplib.c
View file

@ -645,6 +645,7 @@ static int side_get(lua_State *L)
{ {
side_t *side = *((side_t **)luaL_checkudata(L, 1, META_SIDE)); side_t *side = *((side_t **)luaL_checkudata(L, 1, META_SIDE));
enum side_e field = luaL_checkoption(L, 2, side_opt[0], side_opt); enum side_e field = luaL_checkoption(L, 2, side_opt[0], side_opt);
UINT8 i;
if (!side) if (!side)
{ {
@ -667,14 +668,32 @@ static int side_get(lua_State *L)
lua_pushfixed(L, side->rowoffset); lua_pushfixed(L, side->rowoffset);
return 1; return 1;
case side_toptexture: case side_toptexture:
lua_pushinteger(L, side->toptexture); {
texture_t *texture = textures[side->toptexture];
for (i = 0; i < 8; i++)
if (!texture->name[i])
break;
lua_pushlstring(L, texture->name, i);
return 1; return 1;
}
case side_bottomtexture: case side_bottomtexture:
lua_pushinteger(L, side->bottomtexture); {
texture_t *texture = textures[side->bottomtexture];
for (i = 0; i < 8; i++)
if (!texture->name[i])
break;
lua_pushlstring(L, texture->name, i);
return 1; return 1;
}
case side_midtexture: case side_midtexture:
lua_pushinteger(L, side->midtexture); {
texture_t *texture = textures[side->midtexture];
for (i = 0; i < 8; i++)
if (!texture->name[i])
break;
lua_pushlstring(L, texture->name, i);
return 1; return 1;
}
case side_sector: case side_sector:
LUA_PushUserdata(L, side->sector, META_SECTOR); LUA_PushUserdata(L, side->sector, META_SECTOR);
return 1; return 1;
@ -720,13 +739,16 @@ static int side_set(lua_State *L)
side->rowoffset = luaL_checkfixed(L, 3); side->rowoffset = luaL_checkfixed(L, 3);
break; break;
case side_toptexture: case side_toptexture:
side->toptexture = luaL_checkinteger(L, 3); if (R_CheckTextureNumForName(luaL_checkstring(L, 3)) != -1)
side->toptexture = R_TextureNumForName(luaL_checkstring(L, 3));
break; break;
case side_bottomtexture: case side_bottomtexture:
side->bottomtexture = luaL_checkinteger(L, 3); if (R_CheckTextureNumForName(luaL_checkstring(L, 3)) != -1)
side->bottomtexture = R_TextureNumForName(luaL_checkstring(L, 3));
break; break;
case side_midtexture: case side_midtexture:
side->midtexture = luaL_checkinteger(L, 3); if (R_CheckTextureNumForName(luaL_checkstring(L, 3)) != -1)
side->midtexture = R_TextureNumForName(luaL_checkstring(L, 3));
break; break;
case side_repeatcnt: case side_repeatcnt:
side->repeatcnt = luaL_checkinteger(L, 3); side->repeatcnt = luaL_checkinteger(L, 3);