Merge branch 'kart-luatextures-backport' into 'next'

Lua: Expose R_TextureNumForName

See merge request STJr/SRB2!387
This commit is contained in:
Monster Iestyn 2018-12-16 17:15:31 -05:00
commit 62faa135db
2 changed files with 27 additions and 4 deletions

View file

@ -1682,6 +1682,25 @@ static int lib_rSetPlayerSkin(lua_State *L)
return 0; return 0;
} }
// R_DATA
////////////
static int lib_rCheckTextureNumForName(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
//HUDSAFE
lua_pushinteger(L, R_CheckTextureNumForName(name));
return 1;
}
static int lib_rTextureNumForName(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
//HUDSAFE
lua_pushinteger(L, R_TextureNumForName(name));
return 1;
}
// S_SOUND // S_SOUND
//////////// ////////////
@ -2165,6 +2184,10 @@ static luaL_Reg lib[] = {
{"R_Frame2Char",lib_rFrame2Char}, {"R_Frame2Char",lib_rFrame2Char},
{"R_SetPlayerSkin",lib_rSetPlayerSkin}, {"R_SetPlayerSkin",lib_rSetPlayerSkin},
// r_data
{"R_CheckTextureNumForName",lib_rCheckTextureNumForName),
{"R_TextureNumForName",lib_rTextureNumForName),
// s_sound // s_sound
{"S_StartSound",lib_sStartSound}, {"S_StartSound",lib_sStartSound},
{"S_StartSoundAtVolume",lib_sStartSoundAtVolume}, {"S_StartSoundAtVolume",lib_sStartSoundAtVolume},