stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 22:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts merge request !387
This commit is contained in:
Alam Ed Arias 2018-12-16 22:57:39 +00:00
parent 62faa135db
commit 14e98df69b
2 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/lua_baselib.c
View file

@ -1682,25 +1682,6 @@ 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
//////////// ////////////
@ -2184,10 +2165,6 @@ 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},

8
src/lua_maplib.c
View file

@ -795,16 +795,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); side->toptexture = luaL_checkinteger(L, 3);
break; break;
case side_bottomtexture: case side_bottomtexture:
side->bottomtexture = luaL_checkinteger(L, 3); side->bottomtexture = luaL_checkinteger(L, 3);
break; break;
case side_midtexture: case side_midtexture:
side->midtexture = luaL_checkinteger(L, 3); side->midtexture = luaL_checkinteger(L, 3);
break; break;
case side_repeatcnt: case side_repeatcnt:
side->repeatcnt = luaL_checkinteger(L, 3); side->repeatcnt = luaL_checkinteger(L, 3);
break; break;
} }
return 0; return 0;