Merge branch 'no-hasslope' into 'next'

No hasslope

See merge request STJr/SRB2!312
This commit is contained in:
Monster Iestyn 2018-11-08 16:20:28 -05:00
commit 316cf27a7a

View file

@ -46,7 +46,6 @@ enum sector_e {
sector_ffloors, sector_ffloors,
sector_fslope, sector_fslope,
sector_cslope, sector_cslope,
sector_hasslope
#else #else
sector_ffloors sector_ffloors
#endif #endif
@ -69,7 +68,6 @@ static const char *const sector_opt[] = {
#ifdef ESLOPE #ifdef ESLOPE
"f_slope", "f_slope",
"c_slope", "c_slope",
"hasslope",
#endif #endif
NULL}; NULL};
@ -471,9 +469,6 @@ static int sector_get(lua_State *L)
case sector_cslope: // c_slope case sector_cslope: // c_slope
LUA_PushUserdata(L, sector->c_slope, META_SLOPE); LUA_PushUserdata(L, sector->c_slope, META_SLOPE);
return 1; return 1;
case sector_hasslope: // hasslope
lua_pushboolean(L, sector->hasslope);
return 1;
#endif #endif
} }
return 0; return 0;
@ -500,7 +495,6 @@ static int sector_set(lua_State *L)
#ifdef ESLOPE #ifdef ESLOPE
case sector_fslope: // f_slope case sector_fslope: // f_slope
case sector_cslope: // c_slope case sector_cslope: // c_slope
case sector_hasslope: // hasslope
#endif #endif
default: default:
return luaL_error(L, "sector_t field " LUA_QS " cannot be set.", sector_opt[field]); return luaL_error(L, "sector_t field " LUA_QS " cannot be set.", sector_opt[field]);